diff --git a/.chloggen/27241-loadbalancerexporter-aws-support.yaml b/.chloggen/27241-loadbalancerexporter-aws-support.yaml new file mode 100644 index 000000000000..0c1ad76ad7f2 --- /dev/null +++ b/.chloggen/27241-loadbalancerexporter-aws-support.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: exporter/loadbalancingexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adding AWS Cloud Map for service discovery of Collectors backend. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [27241] + +# (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/.chloggen/31543-add-base64decode-function-ottl.yaml b/.chloggen/31543-add-base64decode-function-ottl.yaml new file mode 100644 index 000000000000..79c938797f29 --- /dev/null +++ b/.chloggen/31543-add-base64decode-function-ottl.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: ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Add new function to decode a base64 encoded string and output the original string" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31543] + +# (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/.chloggen/add-compression-option.yaml b/.chloggen/add-compression-option.yaml new file mode 100644 index 000000000000..1f3b91b5daf4 --- /dev/null +++ b/.chloggen/add-compression-option.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: awss3exporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "add `compression` option to enable file compression on S3" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [ 27872 ] + +# (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: | + Add `compression` option to compress files using `compress/gzip` library before uploading to S3. +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [ user ] \ No newline at end of file diff --git a/.chloggen/add_encoding_s3exporter.yaml b/.chloggen/add_encoding_s3exporter.yaml new file mode 100644 index 000000000000..541e2cb458dc --- /dev/null +++ b/.chloggen/add_encoding_s3exporter.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: awss3exporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add support for encoding extension to awss3exporter + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30554] + +# (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/.chloggen/add_integration_test_for_clickhous_exporter.yaml b/.chloggen/add_integration_test_for_clickhous_exporter.yaml new file mode 100644 index 000000000000..231361f1e16e --- /dev/null +++ b/.chloggen/add_integration_test_for_clickhous_exporter.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: clickhouseexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add integration test for clickhouse exporter + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29626] + +# (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/.chloggen/add_node_uid_k8s_attrib.yaml b/.chloggen/add_node_uid_k8s_attrib.yaml new file mode 100644 index 000000000000..bf178ac5425a --- /dev/null +++ b/.chloggen/add_node_uid_k8s_attrib.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: processor/k8sattributes + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add support for `k8s.node.uid` metadata + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31637] + +# (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/.chloggen/dd-feature-gate-removal.yaml b/.chloggen/dd-feature-gate-removal.yaml new file mode 100644 index 000000000000..76f4ee7cb8cf --- /dev/null +++ b/.chloggen/dd-feature-gate-removal.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: datadogconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove feature gate `connector.datadogconnector.performance` + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31638] + +# (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/.chloggen/ddog-config-change.yaml b/.chloggen/ddog-config-change.yaml new file mode 100644 index 000000000000..9d6c23d43994 --- /dev/null +++ b/.chloggen/ddog-config-change.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: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Remove config structs `LimitedClientConfig` and `LimitedTLSClientSettings`" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31733] + +# (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 should have no impact to end users as long as they do not import Datadog exporter config structs in their source code. + +# 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: [api] diff --git a/.chloggen/ddog-data-race.yaml b/.chloggen/ddog-data-race.yaml new file mode 100644 index 000000000000..ac2ee331a729 --- /dev/null +++ b/.chloggen/ddog-data-race.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix data race in metrics exporter shutdown + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31663] + +# (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/.chloggen/ddog-http-defaults.yaml b/.chloggen/ddog-http-defaults.yaml new file mode 100644 index 000000000000..2c703b081e28 --- /dev/null +++ b/.chloggen/ddog-http-defaults.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: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Datadog exporter uses the same default HTTP settings as Datadog Agent HTTP transport + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31733] + +# (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/.chloggen/ddog-respect-confighttp.yaml b/.chloggen/ddog-respect-confighttp.yaml new file mode 100644 index 000000000000..292fe7bec465 --- /dev/null +++ b/.chloggen/ddog-respect-confighttp.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: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Datadog exporter respects a subset of settings in confighttp client configs + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31733] + +# (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: "Currently the following configs are respected: `read_buffer_size`, `write_buffer_size`, `timeout`, `max_idle_conns`, `max_idle_conns_per_host`, `max_conns_per_host`, `idle_conn_timeout`, `disable_keep_alives` and `tls.insecure_skip_verify`." + +# 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/.chloggen/deltatocumulative-limits.yaml b/.chloggen/deltatocumulative-limits.yaml new file mode 100644 index 000000000000..1ff0ff7a8fa7 --- /dev/null +++ b/.chloggen/deltatocumulative-limits.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: "enhancement" + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: "deltatocumulativeprocessor" + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: introduce configurable stream limit + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31488] + +# (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: | + Adds `max_streams` option that allows to set upper bound (default = unlimited) + to the number of tracked streams. Any additional streams exceeding the limit + are dropped. + +# 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/.chloggen/deltatocumulative-timer.yaml b/.chloggen/deltatocumulative-timer.yaml new file mode 100644 index 000000000000..2d0809a3cc57 --- /dev/null +++ b/.chloggen/deltatocumulative-timer.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: "bug_fix" + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: "deltatocumulativeprocessor" + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: timer-based expiry + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31615] + +# (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: | + converts expiry to 1m timer, eliminating a race condition and failing test + +# 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/.chloggen/dev_fix-tls-handshake-telemetrygen.yaml b/.chloggen/dev_fix-tls-handshake-telemetrygen.yaml new file mode 100644 index 000000000000..86f7536b5d7f --- /dev/null +++ b/.chloggen/dev_fix-tls-handshake-telemetrygen.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: telemetrygen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Do not use WithBlock when forming grpc connections for metrics/traces in telemetrygen to avoid infinite retry after failure + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31401] + +# (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/.chloggen/dinesh.gurumurthy_add-container-stats.yaml b/.chloggen/dinesh.gurumurthy_add-container-stats.yaml new file mode 100644 index 000000000000..109e511fda46 --- /dev/null +++ b/.chloggen/dinesh.gurumurthy_add-container-stats.yaml @@ -0,0 +1,23 @@ +# 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: datadogconnector +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add a new option to the Datadog connector to enable container tags on stats Payloads. +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31642] +# (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 adds a new option to the Datadog connector to enable container tags on stats Payloads. This is useful for users who want to use container tags as second primary tag for Datadog APM. +# 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/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml new file mode 100755 index 000000000000..e10597eb4c82 --- /dev/null +++ b/.chloggen/drosiek-add-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: "promote to `alpha` stability" + +# 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/.chloggen/encoding_fileexporter.yaml b/.chloggen/encoding_fileexporter.yaml new file mode 100644 index 000000000000..53229897abcf --- /dev/null +++ b/.chloggen/encoding_fileexporter.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: fileexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adopt the encoding extension with the file exporter. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31774] + +# (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/.chloggen/feat_ottl_xml-parse-function.yaml b/.chloggen/feat_ottl_xml-parse-function.yaml new file mode 100755 index 000000000000..710eedae3f48 --- /dev/null +++ b/.chloggen/feat_ottl_xml-parse-function.yaml @@ -0,0 +1,13 @@ +# 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: pkg/ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add `ParseXML` function for parsing XML from a target string. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31133] diff --git a/.chloggen/featuregate-vcenter-stable.yaml b/.chloggen/featuregate-vcenter-stable.yaml new file mode 100755 index 000000000000..ba7e47d48be6 --- /dev/null +++ b/.chloggen/featuregate-vcenter-stable.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: receiver/vcenter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Bump receiver.vcenter.emitPerfMetricsWithObjects feature gate to stable + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31215] + +# (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/.chloggen/file-exporter-group-by-attr.yaml b/.chloggen/file-exporter-group-by-attr.yaml new file mode 100644 index 000000000000..bf6447ca412c --- /dev/null +++ b/.chloggen/file-exporter-group-by-attr.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: fileexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added the option to write telemetry data into multiple files, where the file path is based on a resource attribute. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24654] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] \ No newline at end of file diff --git a/.chloggen/file-exporter_append_mode.yaml b/.chloggen/file-exporter_append_mode.yaml new file mode 100644 index 000000000000..4520a010887f --- /dev/null +++ b/.chloggen/file-exporter_append_mode.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: fileexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: File write mode is configurable now (truncate or append) + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31364] + +# (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/.chloggen/filestats_filepath.yaml b/.chloggen/filestats_filepath.yaml new file mode 100755 index 000000000000..0d9f7cb25309 --- /dev/null +++ b/.chloggen/filestats_filepath.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: filestatsreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix file.path to return the proper absolute path of the file + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31738] + +# (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/.chloggen/fix-issue-31087.yaml b/.chloggen/fix-issue-31087.yaml new file mode 100644 index 000000000000..48367e89b8c6 --- /dev/null +++ b/.chloggen/fix-issue-31087.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: 'internal/docker' + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: 'Updated docker dependency and fixed zap.String incompatibility' + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31087] + +# (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/.chloggen/fix_cpu-utilization-divide-by-cores.yaml b/.chloggen/fix_cpu-utilization-divide-by-cores.yaml new file mode 100755 index 000000000000..77983b00d2d0 --- /dev/null +++ b/.chloggen/fix_cpu-utilization-divide-by-cores.yaml @@ -0,0 +1,18 @@ +# 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: hostmetricsreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adds the receiver.hostmetrics.normalizeProcessCPUUtilization feature gate to optionally normalize process.cpu.utilization values. + +subtext: > + When enabled, the receiver.hostmetrics.normalizeProcessCPUUtilization feature gate will cause process.cpu.utilization + values to be divided by the number of logical cores on the system. This is necessary to produce a value on the interval of + [0-1], as the description of process.cpu.utilization the metric says. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31368] diff --git a/.chloggen/fix_extract-count-default-unit.yaml b/.chloggen/fix_extract-count-default-unit.yaml new file mode 100644 index 000000000000..c24260ef8ad9 --- /dev/null +++ b/.chloggen/fix_extract-count-default-unit.yaml @@ -0,0 +1,29 @@ +# 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: transformprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Change metric unit for metrics extracted with `extract_count_metric()` to be the default unit (`1`) + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31575] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The original metric `unit` does not apply to extracted `count` metrics the same way it does to `sum`, `min` or `max`. + Metrics extracted using `extract_count_metric()` now use the more appropriate default unit (`1`) instead. + +# 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/.chloggen/goleak_dockerstatsreceiver.yaml b/.chloggen/goleak_dockerstatsreceiver.yaml new file mode 100644 index 000000000000..c3e1b2063e97 --- /dev/null +++ b/.chloggen/goleak_dockerstatsreceiver.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: dockerstatsreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add shutdown method to fix leaking goroutines + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30438] + +# (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/.chloggen/goleak_loadbalancingexp.yaml b/.chloggen/goleak_loadbalancingexp.yaml new file mode 100755 index 000000000000..ccb58dd1c189 --- /dev/null +++ b/.chloggen/goleak_loadbalancingexp.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: loadbalancingexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix memory leaks on shutdown + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31050] + +# (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/.chloggen/k8sattr-rbac.yaml b/.chloggen/k8sattr-rbac.yaml new file mode 100644 index 000000000000..24077d3a066e --- /dev/null +++ b/.chloggen/k8sattr-rbac.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: processor/k8sattributes + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allows k8sattributes processor to work with k8s role/rolebindings when filter::namespace is set. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [14742] + +# (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/.chloggen/main-resource-attribute.yaml b/.chloggen/main-resource-attribute.yaml new file mode 100755 index 000000000000..c8b2a232cae3 --- /dev/null +++ b/.chloggen/main-resource-attribute.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: k8sclusterreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "add optional status_last_terminated_reason resource attribute" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31282] + +# (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/.chloggen/main.yaml b/.chloggen/main.yaml new file mode 100755 index 000000000000..c0c8fe2d2061 --- /dev/null +++ b/.chloggen/main.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: awsproxyextension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Expose service_name as configurable option. Previously, it was hardcoded as xray." + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29550] + +# (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/.chloggen/mx-psi_enable-internal-metric.yaml b/.chloggen/mx-psi_enable-internal-metric.yaml new file mode 100644 index 000000000000..f1875440d10f --- /dev/null +++ b/.chloggen/mx-psi_enable-internal-metric.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add new telemetry metric, `otelcol_datadog_otlp_translator_resources_missing_source` that counts OTLP resources missing a hostname-identifying attribute. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31805] + +# (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: | + - Enable Collector metrics https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md#metrics to check for this metric. + +# 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/.chloggen/mx-psi_lower-log-level-gohai.yaml b/.chloggen/mx-psi_lower-log-level-gohai.yaml new file mode 100644 index 000000000000..24dcdfa9073a --- /dev/null +++ b/.chloggen/mx-psi_lower-log-level-gohai.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: exporter/datadog + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Demote noisy gohai logs to debug level + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29741] + +# (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: | + These logs would be present at the info level when using the official Docker images but were not useful to end-users. + +# 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/.chloggen/nslaughter_reduce-public-api-azuremonitorreceiver.yaml b/.chloggen/nslaughter_reduce-public-api-azuremonitorreceiver.yaml new file mode 100755 index 000000000000..13eda01ea0be --- /dev/null +++ b/.chloggen/nslaughter_reduce-public-api-azuremonitorreceiver.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: azuremonitorreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Reduce the public API for this receiver. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24850] + +# (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 unexports the following types ArmClient, MetricsDefinitionsClientInterface, MetricsValuesClient. + +# 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: [api] diff --git a/.chloggen/prw_failure_translate.yaml b/.chloggen/prw_failure_translate.yaml new file mode 100755 index 000000000000..9188e8920b37 --- /dev/null +++ b/.chloggen/prw_failure_translate.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: prometheusremotewriteexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Publish telemetry about translation of metrics from Otel to Prometheus. Don't drop all data points if some fail translation. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29729] + +# (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/.chloggen/receiver_prometheus_confighttp-ta.yaml b/.chloggen/receiver_prometheus_confighttp-ta.yaml new file mode 100755 index 000000000000..b7bb013f4d30 --- /dev/null +++ b/.chloggen/receiver_prometheus_confighttp-ta.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: prometheusreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Use confighttp for target allocator client + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31449] + +# (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/.chloggen/remove-deprecated-ScraperControllerSettings.yaml b/.chloggen/remove-deprecated-ScraperControllerSettings.yaml new file mode 100644 index 000000000000..07ffa6140f92 --- /dev/null +++ b/.chloggen/remove-deprecated-ScraperControllerSettings.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: general + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update any component using `scraperhelper.ScraperControllerSettings` to use `scraperhelper.ControllerConfig` + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31816] + +# (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 changes the config field name from `ScraperControllerSettings` to `ControllerConfig` + +# 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: [api] diff --git a/.chloggen/remove_ErrNilNextConsumer_impl.yaml b/.chloggen/remove_ErrNilNextConsumer_impl.yaml new file mode 100644 index 000000000000..2dd87dfff4bc --- /dev/null +++ b/.chloggen/remove_ErrNilNextConsumer_impl.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: all + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove explicit checks in all receivers to check if the next consumer is nil + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31793] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: The nil check is now done by the pipeline builder. + +# 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: [api] diff --git a/.chloggen/spanmetrics-feature-metrics-expiration.yaml b/.chloggen/spanmetrics-feature-metrics-expiration.yaml new file mode 100755 index 000000000000..a97e768d2d0d --- /dev/null +++ b/.chloggen/spanmetrics-feature-metrics-expiration.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: spanmetricsconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add `metrics_expiration` option to enable expiration of metrics if spans are not received within a certain time frame. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30559] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: The feature can be configured by specifiying the desired duration in the `metrics_expiration` option. By default, the expiration is disabled (set to 0). + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/.chloggen/sqlquery_shutdown.yaml b/.chloggen/sqlquery_shutdown.yaml new file mode 100644 index 000000000000..387ffed5d5f3 --- /dev/null +++ b/.chloggen/sqlquery_shutdown.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: sqlqueryreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix memory leak on shutdown for log telemetry + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31782] + +# (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/.chloggen/vcenter-cluster-duplication.yaml b/.chloggen/vcenter-cluster-duplication.yaml new file mode 100755 index 000000000000..2c4263de7aea --- /dev/null +++ b/.chloggen/vcenter-cluster-duplication.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: vcenterreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixed the resource attribute model to more accurately support multi-cluster deployments + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30879] + +# (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: | + For more information on impacts please refer https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/31113. The main impacts are that + the `vcenter.resource_pool.name`, `vcenter.resource_pool.inventory_path`, and `vcenter.cluster.name` are reported with more accuracy on VM metrics. + +# 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 b2eb41e05c22..ef3f4316fc33 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -75,7 +75,7 @@ exporter/sapmexporter/ @open-telemetry/collect exporter/sentryexporter/ @open-telemetry/collector-contrib-approvers @AbhiPrasad exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1 exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax -exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @sumo-drosiek +exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek @swiatekm-sumo exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @astencel-sumo exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055 exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1 @@ -111,7 +111,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 +extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek @swiatekm-sumo internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme @@ -174,7 +174,7 @@ processor/resourceprocessor/ @open-telemetry/collect processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken -processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek +processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek @swiatekm-sumo processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley diff --git a/.github/workflows/auto-assign-owners.yml b/.github/workflows/auto-assign-owners.yml index 538bc31bdb0b..b869cfb421b2 100644 --- a/.github/workflows/auto-assign-owners.yml +++ b/.github/workflows/auto-assign-owners.yml @@ -13,7 +13,7 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' }} steps: - name: run - uses: kentaro-m/auto-assign-action@v1.2.6 + uses: kentaro-m/auto-assign-action@v2.0.0 with: configuration-path: ".github/auto_assign.yml" repo-token: '${{ secrets.GITHUB_TOKEN }}' diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index a10f40bc0a98..bb19559b8c6d 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -55,7 +55,7 @@ jobs: - name: Cache Go id: go-mod-cache timeout-minutes: 25 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~\go\pkg\mod diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index be782add7f41..bcd2654a1477 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -31,7 +31,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -93,7 +93,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -106,7 +106,7 @@ jobs: if: steps.go-cache.outputs.cache-hit != 'true' run: make install-tools - name: Cache Lint Build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/go-build key: go-lint-build-${{ matrix.group }}-${{ runner.os }}-${{ hashFiles('**/go.sum') }} @@ -159,7 +159,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -182,7 +182,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -264,7 +264,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -277,7 +277,7 @@ jobs: if: steps.go-cache.outputs.cache-hit != 'true' run: make install-tools - name: Cache Test Build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/go-build key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }} @@ -318,7 +318,7 @@ jobs: merge-multiple: true pattern: coverage-artifacts-* - name: Upload coverage report - uses: Wandalen/wretry.action@v1.4.5 + uses: Wandalen/wretry.action@v1.4.10 with: action: codecov/codecov-action@v3 with: | @@ -355,7 +355,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -393,7 +393,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -419,7 +419,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -488,7 +488,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -571,7 +571,7 @@ jobs: pattern: collector-binaries-* - name: Cache Wix id: wix-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | "C:\Program Files (x86)\WiX Toolset v3.11" @@ -628,7 +628,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 785f59c8f30b..4f291cafafa2 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -38,7 +38,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 60646f043f23..f30a7d31d4f0 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -56,7 +56,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -88,7 +88,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -135,7 +135,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml index f29c489c9dae..3b8cbbb2460e 100644 --- a/.github/workflows/load-tests.yml +++ b/.github/workflows/load-tests.yml @@ -31,7 +31,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -69,7 +69,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml index ccd6c210a9be..6332743b5326 100644 --- a/.github/workflows/prometheus-compliance-tests.yml +++ b/.github/workflows/prometheus-compliance-tests.yml @@ -32,7 +32,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml index 27fdabe5c024..94a1ac2c71e1 100644 --- a/.github/workflows/telemetrygen.yml +++ b/.github/workflows/telemetrygen.yml @@ -29,7 +29,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -68,7 +68,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin @@ -113,7 +113,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 354b431c59de..3116f46391eb 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -26,7 +26,7 @@ jobs: - name: Cache Go id: go-cache timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/go/bin diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a7efcb7d413..dd639d9a55a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -119,7 +119,7 @@ Components refer to connectors, exporters, extensions, processors, and receivers * Implement the [component.Component](https://pkg.go.dev/go.opentelemetry.io/collector/component#Component) interface * Provide a configuration structure which defines the configuration of the component * Provide the implementation which performs the component operation -* Have a `metadata.yaml` file and its generated code (using [mdatadgen](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/README.md)). +* Have a `metadata.yaml` file and its generated code (using [mdatadgen](https://github.com/open-telemetry/opentelemetry-collector/blob/main/cmd/mdatagen/README.md)). Familiarize yourself with the interface of the component that you want to write, and use existing implementations as a reference. [Building a Trace Receiver](https://opentelemetry.io/docs/collector/trace-receiver/) tutorial provides a detailed example of building a component. @@ -152,7 +152,26 @@ and its contributors. and in the respective testing harnesses. To align with the test goal of the project, components must be testable within the framework defined within the folder. If a component can not be properly tested within the existing framework, it must increase the non testable components number with a comment within the PR explaining as to why it can not be tested. -- Create a `metadata.yaml` file with at minimum the required fields defined in [metadata-schema.yaml](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/metadata-schema.yaml). +- Enable [goleak checks](https://github.com/uber-go/goleak) to help ensure your component does not leak goroutines. This + requires adding a file named `package_test.go` to every sub-directory containing tests. This file should have the following contents by default: +``` +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package fooreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} +``` + +- Create a `metadata.yaml` file with at minimum the required fields defined in [metadata-schema.yaml](https://github.com/open-telemetry/opentelemetry-collector/blob/main/cmd/mdatagen/metadata-schema.yaml). Here is a minimal representation: ``` type: @@ -181,7 +200,7 @@ status: // Package fooreceiver bars. package fooreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fooreceiver" ``` -- Type `make update-codeowners`. This will trigger the regeneration of the `.github/CODEOWNERS` file and the [metadata generator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/README.md#using-the-metadata-generator) to generate the associated code/documentation. +- Type `make update-codeowners`. This will trigger the regeneration of the `.github/CODEOWNERS` file and the [metadata generator](https://github.com/open-telemetry/opentelemetry-collector/blob/main/cmd/mdatagen/README.md#using-the-metadata-generator) to generate the associated code/documentation. When submitting a component to the community, consider breaking it down into separate PRs as follows: diff --git a/cmd/checkapi/main.go b/cmd/checkapi/main.go index 50d2bff18a71..5e99e6237c36 100644 --- a/cmd/checkapi/main.go +++ b/cmd/checkapi/main.go @@ -47,10 +47,11 @@ func run(folder string, allowlistFilePath string) error { } allowlist := strings.Split(string(allowlistData), "\n") var errs []error - err = filepath.Walk(folder, func(path string, info fs.FileInfo, err error) error { + err = filepath.Walk(folder, func(path string, info fs.FileInfo, _ error) error { if info.Name() == "go.mod" { base := filepath.Dir(path) - relativeBase, err := filepath.Rel(folder, base) + var relativeBase string + relativeBase, err = filepath.Rel(folder, base) if err != nil { return err } @@ -67,7 +68,7 @@ func run(folder string, allowlistFilePath string) error { return nil } } - if err := walkFolder(base, componentType); err != nil { + if err = walkFolder(base, componentType); err != nil { errs = append(errs, err) } } diff --git a/cmd/configschema/comments_test.go b/cmd/configschema/comments_test.go index 06880828840e..2d906a3d3968 100644 --- a/cmd/configschema/comments_test.go +++ b/cmd/configschema/comments_test.go @@ -35,7 +35,7 @@ func TestExternalType(t *testing.T) { } func TestSubPackage(t *testing.T) { - s := configtls.TLSClientSetting{} + s := configtls.ClientConfig{} v := reflect.ValueOf(s) _, err := commentsForStruct(v, testDR()) require.NoError(t, err) diff --git a/cmd/configschema/common_test.go b/cmd/configschema/common_test.go index e55401bfd71b..3287e534ea3c 100644 --- a/cmd/configschema/common_test.go +++ b/cmd/configschema/common_test.go @@ -22,13 +22,13 @@ type testStruct struct { Four bool `mapstructure:"four"` // embedded, package qualified comment time.Duration `mapstructure:"duration"` - Squashed testPerson `mapstructure:",squash"` - PersonPtr *testPerson `mapstructure:"person_ptr"` - PersonStruct testPerson `mapstructure:"person_struct"` - Persons []testPerson `mapstructure:"persons"` - PersonPtrs []*testPerson `mapstructure:"person_ptrs"` - Ignored string `mapstructure:"-"` - TLS configtls.TLSClientSetting `mapstructure:"tls"` + Squashed testPerson `mapstructure:",squash"` + PersonPtr *testPerson `mapstructure:"person_ptr"` + PersonStruct testPerson `mapstructure:"person_struct"` + Persons []testPerson `mapstructure:"persons"` + PersonPtrs []*testPerson `mapstructure:"person_ptrs"` + Ignored string `mapstructure:"-"` + TLS configtls.ClientConfig `mapstructure:"tls"` } func testDR() DirResolver { diff --git a/cmd/configschema/docsgen/docsgen/package_test.go b/cmd/configschema/docsgen/docsgen/package_test.go new file mode 100644 index 000000000000..b0e28474f911 --- /dev/null +++ b/cmd/configschema/docsgen/docsgen/package_test.go @@ -0,0 +1,31 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package docsgen + +import ( + "testing" + + "go.uber.org/goleak" +) + +// The Ignore function calls prevent catching leaks generated by indirect dependencies. +// All of these are leaks that we can't fix from within the collector code base. +// Regarding the OpenCensus ignore: see https://github.com/census-instrumentation/opencensus-go/issues/1191 +// Regarding the DataDog ignore: see https://github.com/DataDog/datadog-agent/issues/22030 +// Regarding the database/sql ignore: see https://github.com/SAP/go-hdb/issues/130 +// Regarding the SAP/go-hdb ignore: see https://github.com/SAP/go-hdb/issues/131 +// Regarding the cihub/seelog ignore: see https://github.com/cihub/seelog/issues/182 +// Regarding the godbus/dbus ignore: see https://github.com/99designs/keyring/issues/135 +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, + goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"), + goleak.IgnoreTopFunction("github.com/DataDog/datadog-agent/pkg/trace/metrics/timing.(*Set).Autoreport.func1"), + // Unfortunately this ignore can't be anymore specific, even though it's caused by the SAP/go-hdb/driver + // package. There's no reference to this package in the goleak output. This has the potential of + // hiding future leaks, so we should remove as soon as the referenced issue is resolved. + goleak.IgnoreTopFunction("database/sql.(*DB).connectionOpener"), + goleak.IgnoreTopFunction("github.com/SAP/go-hdb/driver.(*metrics).collect"), + goleak.IgnoreAnyFunction("github.com/cihub/seelog.(*asyncLoopLogger).processQueue"), + goleak.IgnoreAnyFunction("github.com/godbus/dbus.(*Conn).inWorker")) +} diff --git a/cmd/configschema/docsgen/docsgen/template.go b/cmd/configschema/docsgen/docsgen/template.go index 1c5d7a2a6359..4475c859161b 100644 --- a/cmd/configschema/docsgen/docsgen/template.go +++ b/cmd/configschema/docsgen/docsgen/template.go @@ -28,14 +28,14 @@ func join(s string) string { return strings.ReplaceAll(s, "\n", " ") } -// mkAnchor takes a name and a type (e.g. "configtls.TLSClientSetting") and +// mkAnchor takes a name and a type (e.g. "configtls.ClientConfig") and // returns a string suitable for use as a markdown anchor. func mkAnchor(name, typ string) string { if isDuration(typ) { return "time-Duration" } idx := strings.IndexRune(typ, '.') - // strip "configtls." from e.g. "configtls.TLSClientSetting" + // strip "configtls." from e.g. "configtls.ClientConfig" typeStripped := typ[idx+1:] concat := fmt.Sprintf("%s-%s", name, typeStripped) asterisksRemoved := strings.ReplaceAll(concat, "*", "") diff --git a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json index c1a1f0a71b07..b7d9f54fe147 100644 --- a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json +++ b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json @@ -37,7 +37,7 @@ }, { "Name": "tls_settings", - "Type": "*configtls.TLSServerSetting", + "Type": "*configtls.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "Configures the protocol to use TLS.\nThe default value is nil, which will cause the protocol to not use TLS.\n", @@ -276,7 +276,7 @@ }, { "Name": "tls_settings", - "Type": "*configtls.TLSServerSetting", + "Type": "*configtls.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "TLSSetting struct exposes TLS client configuration.\n", diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 960c1ccb58eb..f44c51737963 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -10,10 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 golang.org/x/mod v0.16.0 golang.org/x/text v0.14.0 @@ -170,13 +170,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect ) require ( - bitbucket.org/atlassian/go-asap/v2 v2.7.0 // indirect - cloud.google.com/go v0.112.0 // indirect + bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect + cloud.google.com/go v0.112.1 // indirect cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect cloud.google.com/go/iam v1.1.6 // indirect @@ -184,12 +184,13 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.57.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/AthenZ/athenz v1.10.39 // indirect @@ -213,8 +214,8 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/ClickHouse/ch-go v0.58.2 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.17.1 // indirect + github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -244,14 +245,14 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect - github.com/SAP/go-hdb v1.8.5 // indirect + github.com/SAP/go-hdb v1.8.11 // indirect github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.70 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.71 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect @@ -259,25 +260,26 @@ require ( github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.50.27 // indirect - github.com/aws/aws-sdk-go-v2 v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.4 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect github.com/aws/smithy-go v1.20.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -296,7 +298,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc v2.2.1+incompatible // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -306,8 +308,8 @@ require ( github.com/devigned/tab v0.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.104.1 // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.9+incompatible // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/docker v25.0.4+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -331,7 +333,8 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect - github.com/go-faster/errors v0.6.1 // indirect + github.com/go-faster/errors v0.7.1 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -342,7 +345,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect + github.com/go-sql-driver/mysql v1.8.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/go-zookeeper/zk v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect @@ -359,9 +362,9 @@ require ( github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/cadvisor v0.48.1 // indirect + github.com/google/cadvisor v0.49.1 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -369,7 +372,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gophercloud/gophercloud v1.7.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -406,14 +409,14 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect - github.com/jackc/pgx/v4 v4.18.1 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/jackc/pgx/v4 v4.18.3 // indirect + github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect @@ -544,7 +547,7 @@ require ( github.com/outcaste-io/ristretto v0.2.1 // indirect github.com/ovh/go-ovh v1.4.3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/paulmach/orb v0.10.0 // indirect + github.com/paulmach/orb v0.11.1 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -557,9 +560,9 @@ require ( github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect 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.5.1 // indirect @@ -576,7 +579,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.8 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -606,7 +609,7 @@ require ( github.com/vishvananda/netlink v1.2.1-beta.2 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e // indirect - github.com/vmware/govmomi v0.35.0 // indirect + github.com/vmware/govmomi v0.36.1 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect @@ -619,43 +622,43 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.49.0 // indirect @@ -687,26 +690,25 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.166.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect - k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect + k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1149,3 +1151,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/stor replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage => ../../extension/storage/dbstorage replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../../extension/encoding diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 2b7bd86451de..33cd5ab93dce 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1,5 +1,5 @@ -bitbucket.org/atlassian/go-asap/v2 v2.7.0 h1:TKL1UN1rAJzHM4/8eURzFwdE3K6TEl/EN9XtahvqYX0= -bitbucket.org/atlassian/go-asap/v2 v2.7.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= +bitbucket.org/atlassian/go-asap/v2 v2.8.0 h1:JL4jktrZT3H8GHkkeJ1RCdhJ5YcOyVccA/2TJ4ae3I0= +bitbucket.org/atlassian/go-asap/v2 v2.8.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -20,8 +20,8 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= -cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= +cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= +cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.57.0 h1:fJq+ZfQUDHE+cy1li0bJA8+sy2oiSGhuGqN5nqVaZdU= -cloud.google.com/go/spanner v1.57.0/go.mod h1:aXQ5QDdhPRIqVhYmnkAdwPYvj/DRN0FguclhEWw+jOo= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -70,6 +70,8 @@ code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= @@ -155,10 +157,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= -github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1 h1:ZCmAYWpu75IyEi7+Yrs/uaAjiCGY5wfW5kXo64exkX4= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ= +github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= +github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -244,8 +246,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= @@ -298,12 +300,12 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.1 h1:K6kwgo+UiYx+/kr6CO0PN5ACZDzE3n github.com/alibabacloud-go/tea-utils/v2 v2.0.1/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= github.com/alibabacloud-go/tea-xml v1.1.2 h1:oLxa7JUXm2EDFzMg+7oRsYc+kutgCVwm+bZlhhmvW5M= github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/aliyun-log-go-sdk v0.1.70 h1:UUYesP5PL3kps6RuqpGwCbXylDWB54urJfXnp5qKJWM= -github.com/aliyun/aliyun-log-go-sdk v0.1.70/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= +github.com/aliyun/aliyun-log-go-sdk v0.1.71 h1:0zC74BgKUhmCDrrUArsjQD/igfNyAnc2vyuu9zLNRAc= +github.com/aliyun/aliyun-log-go-sdk v0.1.71/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= github.com/aliyun/credentials-go v1.1.2 h1:qU1vwGIBb3UJ8BwunHDRFtAhS6jnQLnde/yk0+Ih2GY= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= @@ -338,33 +340,33 @@ github.com/aws/aws-sdk-go v1.50.27/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3Tj github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.25.2 h1:/uiG1avJRgLGiQM9X3qJM8+Qa6KRGK5rRPuXE0HUM+w= -github.com/aws/aws-sdk-go-v2 v1.25.2/go.mod h1:Evoc5AsmtveRt1komDwIsjHFyrP5tDuF1D1U+6z6pNo= +github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0= +github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo= github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/config v1.27.4 h1:AhfWb5ZwimdsYTgP7Od8E9L1u4sKmDW2ZVeLcf2O42M= -github.com/aws/aws-sdk-go-v2/config v1.27.4/go.mod h1:zq2FFXK3A416kiukwpsd+rD4ny6JC7QSkp4QdN1Mp2g= +github.com/aws/aws-sdk-go-v2/config v1.27.7 h1:JSfb5nOQF01iOgxFI5OIKWwDiEXWTyTgg1Mm1mHi0A4= +github.com/aws/aws-sdk-go-v2/config v1.27.7/go.mod h1:PH0/cNpoMO+B04qET699o5W92Ca79fVtbUnvMIZro4I= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4 h1:h5Vztbd8qLppiPwX+y0Q6WiwMZgpd9keKe2EAENgAuI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4/go.mod h1:+30tpwrkOgvkJL1rUZuRLoxcJwtI/OkeBLYnHxJtVe0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982SyVKOJD+K8HIezu4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 h1:AK0J8iYBFeUk2Ax7O8YpLtFsfhdOByh2QIkHmigpRYk= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2/go.mod h1:iRlGzMix0SExQEviAyptRWRGdYNo3+ufW/lCzvKVTUc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 h1:E3Y+OfzOK1+rmRo/K2G0ml8Vs+Xqk0kOnf4nS0kUtBc= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59/go.mod h1:1M4PLSBUVfBI0aP+C9XI7SM6kZPCGYyI6izWz0TGprE= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 h1:bNo4LagzUKbjdxE0tIcR9pMzLR2U/Tgie1Hq1HQ3iH8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2/go.mod h1:wRQv0nN6v9wDXuWThpovGQjqF1HFdcgWjporw14lS8k= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 h1:EtOU5jsPdIQNP+6Q2C5e3d65NKT1PeCiQk+9OdzO12Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2/go.mod h1:tyF5sKccmDz0Bv4NrstEr+/9YkSPJHrcO7UsUKf7pWM= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= @@ -378,26 +380,28 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPt github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 h1:5ffmXjPtwRExp1zc7gENLgCPyHFbhEPwVTkTiH9niSk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2/go.mod h1:Ru7vg1iQ7cR4i7SZ/JTLYN9kaXtbL69UdgG0OQWQxW0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 h1:p8dOJ/UKXOwttc1Cxw1Ek52klVmMuiaCUkhsUGxce1I= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1/go.mod h1:VpH1IBG1YYZHPu5qShNt7EGaqUQbHAJZrbDtEpqDvvY= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 h1:B1G2pSPvbAtQjilPq+Y7jLIzCOwKzuVEl+aBBaNG0AQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 h1:BdhnpGGsss5D70eA9WUDvK65HiPx0vyPmh+Tmh2Ue7U= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2/go.mod h1:zTbnRWj5oiNEAl7Vh0Gtr03gywl5R/qdDR8z2BmV7ns= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 h1:utEGkfdQ4L6YW/ietH7111ZYglLJvS+sLriHJ1NBJEQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1/go.mod h1:RsYqzYr2F2oPDdpy+PdhephuZxTfjHQe7SOBcZGoAU8= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 h1:9/GylMS45hGGFCcMrUZDVayQE1jYSIN6da9jo7RAYIw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1/go.mod h1:YjAPFn4kGFqKC54VsHs5fn5B6d+PCY2tziEa3U/GB5Y= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2/go.mod h1:JYzLoEVeLXk+L4tn1+rrkfhkxl6mLDEVaDSvGq9og90= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 h1:3I2cBEYgKhrWlwyZgfpSO2BpaMY1LHPqXYk/QGlu2ew= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1/go.mod h1:uQ7YYKZt3adCRrdCBREm1CD3efFLOUNH77MrUCvx5oA= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB2RnnQdguhXpmeQk= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= @@ -475,16 +479,16 @@ github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKk github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= -github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -528,12 +532,12 @@ github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TR github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8= +github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -625,11 +629,13 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= -github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI= -github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -647,7 +653,6 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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= @@ -676,8 +681,8 @@ github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPr github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -757,8 +762,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -768,8 +773,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/cadvisor v0.48.1 h1:eyYTxKBd+KxI1kh6rst4JSTLUhfHQM34qGpp+0AMlSg= -github.com/google/cadvisor v0.48.1/go.mod h1:ZkYbiiVdyoqBmI2ahZI8GlmirT78OAOER0z4EQugkxQ= +github.com/google/cadvisor v0.49.1 h1:9M++63nWvdq6Oci6wUDuAfQNTZpuz1ZObln0Bhs9xN0= +github.com/google/cadvisor v0.49.1/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -825,8 +830,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= @@ -987,8 +992,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= -github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -1004,8 +1009,8 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= -github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= @@ -1019,14 +1024,13 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= -github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= @@ -1049,6 +1053,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -1214,6 +1220,8 @@ github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vyg github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1325,8 +1333,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s= -github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -1391,8 +1399,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1401,8 +1409,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1415,8 +1423,8 @@ github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH 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= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -1462,8 +1470,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1537,8 +1545,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxCHz3zSG67cLDDu8w3TkFm/FwiyiAWBhcidGXWH/0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= -github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk= -github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U= +github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8= +github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU= github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6BY= github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -1586,8 +1594,8 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e h1:Vu41Q0Pv3yMdd+tcDW6QeEUIK2L+9ZrPrq8NAMrKSLc= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aRq5pxwgdJpAuP97SCjX1+Db32z/b0dggQ07FDF+fqE= -github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0= -github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY= +github.com/vmware/govmomi v0.36.1 h1:+E/nlfteQ8JvC0xhuKAfpnMsuIeGeGj7rJwqENUcWm8= +github.com/vmware/govmomi v0.36.1/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -1645,92 +1653,92 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a h1:pv7jzJUXo1wx1lpqLBjyvMPZ49MaY2FJzRPvzhCcyQM= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:DzYm9k0mVbvmGKTKxqCyRyRYxNofVCMLS8CKn8DvLpg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:RyAPd9frTtdmq/tkAKgW0kj9Eju8vapui0otxzFA+Sk= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2cZadfyG1PH9V4WghncyZGAPTPgjUDmnmNyS5dKf9pw= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:7jHwA6IoBYR8p5ltqNm/hZUMgXHeL3Y8hXjsTe0XN+8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cwNkIhOcU9ltYj7Xrrn9/6+j6XZC8hMZcXU8/J0DzeE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a h1:4uN68N5k2JQkGJm2P1NHlX3rSWBAnpBpO03xO6dy58k= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:te/gJxX/rw7VYnXxmV4qjUv8YYeL1YNCAxgAI92sZoU= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a h1:3idLe4piHkcyEb6j7XyDfSxmScI0nhe5O/Wa/Molnkk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:PWKLpwkarM7db/ho+fF+X8ynke3EFiXfGXdDiCmKMPw= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:GgPvWGYWmY4+LPKRxz6q7UPRbcRscQQNXJZQ8GryY6s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PHw6sVRsSCdGBRs032Mf8PxNqZgNJ0fVBBLtpWCdx0A= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -2164,8 +2172,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2189,8 +2197,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2246,10 +2254,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2276,8 +2284,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -2320,8 +2328,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -2353,27 +2359,27 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod index 682d9e82df3e..da119aadc655 100644 --- a/cmd/githubgen/go.mod +++ b/cmd/githubgen/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/google/go-github/v59 v59.0.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum index 85ae163e8c31..5851412d5595 100644 --- a/cmd/githubgen/go.sum +++ b/cmd/githubgen/go.sum @@ -23,10 +23,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= 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/examples/supervisor_darwin.yaml b/cmd/opampsupervisor/examples/supervisor_darwin.yaml index 379792377882..80d5b8bb5755 100644 --- a/cmd/opampsupervisor/examples/supervisor_darwin.yaml +++ b/cmd/opampsupervisor/examples/supervisor_darwin.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/examples/supervisor_linux.yaml b/cmd/opampsupervisor/examples/supervisor_linux.yaml index 0c2cf5ce8430..00021ece6b40 100644 --- a/cmd/opampsupervisor/examples/supervisor_linux.yaml +++ b/cmd/opampsupervisor/examples/supervisor_linux.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/examples/supervisor_windows.yaml b/cmd/opampsupervisor/examples/supervisor_windows.yaml index 35c20b62ca21..13d0a911d78d 100644 --- a/cmd/opampsupervisor/examples/supervisor_windows.yaml +++ b/cmd/opampsupervisor/examples/supervisor_windows.yaml @@ -4,7 +4,7 @@ server: # Disable verification to test locally. # Don't do this in production. insecure_skip_verify: true - # For more TLS settings see config/configtls.TLSClientSetting + # For more TLS settings see config/configtls.ClientConfig capabilities: reports_effective_config: true diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod index 309af43107b8..a7c285e661e1 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.9.0 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -27,10 +27,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // 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 v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // 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 - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum index 5e69af80e538..e06b5c928a24 100644 --- a/cmd/opampsupervisor/go.sum +++ b/cmd/opampsupervisor/go.sum @@ -41,14 +41,14 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= @@ -59,8 +59,8 @@ golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/cmd/opampsupervisor/supervisor/config/config.go b/cmd/opampsupervisor/supervisor/config/config.go index ccbd523d4e6f..7d5000574231 100644 --- a/cmd/opampsupervisor/supervisor/config/config.go +++ b/cmd/opampsupervisor/supervisor/config/config.go @@ -25,7 +25,7 @@ type Capabilities struct { type OpAMPServer struct { Endpoint string - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` } type Agent struct { diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index fb5fa75c890d..34f31fdf3be4 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -6,8 +6,8 @@ dist: otelcol_version: 0.96.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.96.0 @@ -30,6 +30,7 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.96.0 @@ -42,9 +43,9 @@ extensions: import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.96.0 @@ -91,8 +92,8 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.96.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.96.0 @@ -115,7 +116,7 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.96.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.96.0 @@ -204,7 +205,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.96.0 @@ -442,6 +443,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/extension/remotetapextension => ../../extension/remotetapextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension => ../../extension/opampextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension + - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index 7c91bf81f859..b4825c85adde 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -96,6 +96,7 @@ import ( solarwindsapmsettingsextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension" dbstorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage" filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage" + sumologicextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" cumulativetodeltaprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" deltatorateprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor" @@ -233,6 +234,7 @@ func components() (otelcol.Factories, error) { solarwindsapmsettingsextension.NewFactory(), dbstorage.NewFactory(), filestorage.NewFactory(), + sumologicextension.NewFactory(), otlpencodingextension.NewFactory(), jaegerencodingextension.NewFactory(), jsonlogencodingextension.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index d30e75a8101f..1b9167217e25 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -82,6 +82,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 @@ -192,34 +193,34 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 golang.org/x/sys v0.18.0 ) require ( - bitbucket.org/atlassian/go-asap/v2 v2.7.0 // indirect + bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect cloud.google.com/go v0.112.1 // indirect cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect @@ -228,12 +229,13 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.57.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/AthenZ/athenz v1.10.39 // indirect @@ -261,8 +263,8 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect - github.com/ClickHouse/ch-go v0.58.2 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.17.1 // indirect + github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -294,14 +296,14 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect - github.com/SAP/go-hdb v1.8.5 // indirect + github.com/SAP/go-hdb v1.8.11 // indirect github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.70 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.71 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect @@ -309,25 +311,26 @@ require ( github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.50.27 // indirect - github.com/aws/aws-sdk-go-v2 v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.4 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect github.com/aws/smithy-go v1.20.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -346,7 +349,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc v2.2.1+incompatible // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -356,8 +359,8 @@ require ( github.com/devigned/tab v0.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.104.1 // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.9+incompatible // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/docker v25.0.3+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -381,7 +384,8 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect - github.com/go-faster/errors v0.6.1 // indirect + github.com/go-faster/errors v0.7.1 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -392,7 +396,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect + github.com/go-sql-driver/mysql v1.8.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/go-zookeeper/zk v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect @@ -410,9 +414,9 @@ require ( github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/cadvisor v0.48.1 // indirect + github.com/google/cadvisor v0.49.1 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -421,7 +425,7 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gophercloud/gophercloud v1.7.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.1 // indirect @@ -459,14 +463,14 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect - github.com/jackc/pgx/v4 v4.18.1 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/jackc/pgx/v4 v4.18.3 // indirect + github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect @@ -508,6 +512,7 @@ require ( github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect @@ -575,7 +580,7 @@ require ( github.com/outcaste-io/ristretto v0.2.1 // indirect github.com/ovh/go-ovh v1.4.3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/paulmach/orb v0.10.0 // indirect + github.com/paulmach/orb v0.11.1 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -588,9 +593,9 @@ require ( github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/redis/go-redis/v9 v9.5.1 // indirect github.com/relvacode/iso8601 v1.4.0 // indirect @@ -608,7 +613,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.8 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -638,7 +643,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e // indirect - github.com/vmware/govmomi v0.35.0 // indirect + github.com/vmware/govmomi v0.36.1 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect @@ -651,25 +656,25 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.49.0 // indirect @@ -702,27 +707,26 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.166.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect - k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect + k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1187,6 +1191,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/opam replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 9234cc480e80..a08fb70f65e3 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1,5 +1,5 @@ -bitbucket.org/atlassian/go-asap/v2 v2.7.0 h1:TKL1UN1rAJzHM4/8eURzFwdE3K6TEl/EN9XtahvqYX0= -bitbucket.org/atlassian/go-asap/v2 v2.7.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= +bitbucket.org/atlassian/go-asap/v2 v2.8.0 h1:JL4jktrZT3H8GHkkeJ1RCdhJ5YcOyVccA/2TJ4ae3I0= +bitbucket.org/atlassian/go-asap/v2 v2.8.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.57.0 h1:fJq+ZfQUDHE+cy1li0bJA8+sy2oiSGhuGqN5nqVaZdU= -cloud.google.com/go/spanner v1.57.0/go.mod h1:aXQ5QDdhPRIqVhYmnkAdwPYvj/DRN0FguclhEWw+jOo= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -69,6 +69,8 @@ code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= @@ -154,10 +156,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= -github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1 h1:ZCmAYWpu75IyEi7+Yrs/uaAjiCGY5wfW5kXo64exkX4= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ= +github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= +github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -242,8 +244,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= @@ -296,12 +298,12 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.1 h1:K6kwgo+UiYx+/kr6CO0PN5ACZDzE3n github.com/alibabacloud-go/tea-utils/v2 v2.0.1/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= github.com/alibabacloud-go/tea-xml v1.1.2 h1:oLxa7JUXm2EDFzMg+7oRsYc+kutgCVwm+bZlhhmvW5M= github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/aliyun-log-go-sdk v0.1.70 h1:UUYesP5PL3kps6RuqpGwCbXylDWB54urJfXnp5qKJWM= -github.com/aliyun/aliyun-log-go-sdk v0.1.70/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= +github.com/aliyun/aliyun-log-go-sdk v0.1.71 h1:0zC74BgKUhmCDrrUArsjQD/igfNyAnc2vyuu9zLNRAc= +github.com/aliyun/aliyun-log-go-sdk v0.1.71/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= github.com/aliyun/credentials-go v1.1.2 h1:qU1vwGIBb3UJ8BwunHDRFtAhS6jnQLnde/yk0+Ih2GY= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= @@ -336,33 +338,33 @@ github.com/aws/aws-sdk-go v1.50.27/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3Tj github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.25.2 h1:/uiG1avJRgLGiQM9X3qJM8+Qa6KRGK5rRPuXE0HUM+w= -github.com/aws/aws-sdk-go-v2 v1.25.2/go.mod h1:Evoc5AsmtveRt1komDwIsjHFyrP5tDuF1D1U+6z6pNo= +github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0= +github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo= github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/config v1.27.4 h1:AhfWb5ZwimdsYTgP7Od8E9L1u4sKmDW2ZVeLcf2O42M= -github.com/aws/aws-sdk-go-v2/config v1.27.4/go.mod h1:zq2FFXK3A416kiukwpsd+rD4ny6JC7QSkp4QdN1Mp2g= +github.com/aws/aws-sdk-go-v2/config v1.27.7 h1:JSfb5nOQF01iOgxFI5OIKWwDiEXWTyTgg1Mm1mHi0A4= +github.com/aws/aws-sdk-go-v2/config v1.27.7/go.mod h1:PH0/cNpoMO+B04qET699o5W92Ca79fVtbUnvMIZro4I= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4 h1:h5Vztbd8qLppiPwX+y0Q6WiwMZgpd9keKe2EAENgAuI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4/go.mod h1:+30tpwrkOgvkJL1rUZuRLoxcJwtI/OkeBLYnHxJtVe0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982SyVKOJD+K8HIezu4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 h1:AK0J8iYBFeUk2Ax7O8YpLtFsfhdOByh2QIkHmigpRYk= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2/go.mod h1:iRlGzMix0SExQEviAyptRWRGdYNo3+ufW/lCzvKVTUc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 h1:E3Y+OfzOK1+rmRo/K2G0ml8Vs+Xqk0kOnf4nS0kUtBc= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59/go.mod h1:1M4PLSBUVfBI0aP+C9XI7SM6kZPCGYyI6izWz0TGprE= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 h1:bNo4LagzUKbjdxE0tIcR9pMzLR2U/Tgie1Hq1HQ3iH8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2/go.mod h1:wRQv0nN6v9wDXuWThpovGQjqF1HFdcgWjporw14lS8k= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 h1:EtOU5jsPdIQNP+6Q2C5e3d65NKT1PeCiQk+9OdzO12Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2/go.mod h1:tyF5sKccmDz0Bv4NrstEr+/9YkSPJHrcO7UsUKf7pWM= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= @@ -376,26 +378,28 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPt github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 h1:5ffmXjPtwRExp1zc7gENLgCPyHFbhEPwVTkTiH9niSk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2/go.mod h1:Ru7vg1iQ7cR4i7SZ/JTLYN9kaXtbL69UdgG0OQWQxW0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 h1:p8dOJ/UKXOwttc1Cxw1Ek52klVmMuiaCUkhsUGxce1I= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1/go.mod h1:VpH1IBG1YYZHPu5qShNt7EGaqUQbHAJZrbDtEpqDvvY= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 h1:B1G2pSPvbAtQjilPq+Y7jLIzCOwKzuVEl+aBBaNG0AQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 h1:BdhnpGGsss5D70eA9WUDvK65HiPx0vyPmh+Tmh2Ue7U= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2/go.mod h1:zTbnRWj5oiNEAl7Vh0Gtr03gywl5R/qdDR8z2BmV7ns= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 h1:utEGkfdQ4L6YW/ietH7111ZYglLJvS+sLriHJ1NBJEQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1/go.mod h1:RsYqzYr2F2oPDdpy+PdhephuZxTfjHQe7SOBcZGoAU8= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 h1:9/GylMS45hGGFCcMrUZDVayQE1jYSIN6da9jo7RAYIw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1/go.mod h1:YjAPFn4kGFqKC54VsHs5fn5B6d+PCY2tziEa3U/GB5Y= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2/go.mod h1:JYzLoEVeLXk+L4tn1+rrkfhkxl6mLDEVaDSvGq9og90= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 h1:3I2cBEYgKhrWlwyZgfpSO2BpaMY1LHPqXYk/QGlu2ew= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1/go.mod h1:uQ7YYKZt3adCRrdCBREm1CD3efFLOUNH77MrUCvx5oA= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB2RnnQdguhXpmeQk= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= @@ -473,16 +477,16 @@ github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKk github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= -github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -526,12 +530,12 @@ github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TR github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= +github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -621,11 +625,13 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= -github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI= -github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -643,7 +649,6 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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= @@ -672,8 +677,8 @@ github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPr github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -753,8 +758,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -764,8 +769,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.48.1 h1:eyYTxKBd+KxI1kh6rst4JSTLUhfHQM34qGpp+0AMlSg= -github.com/google/cadvisor v0.48.1/go.mod h1:ZkYbiiVdyoqBmI2ahZI8GlmirT78OAOER0z4EQugkxQ= +github.com/google/cadvisor v0.49.1 h1:9M++63nWvdq6Oci6wUDuAfQNTZpuz1ZObln0Bhs9xN0= +github.com/google/cadvisor v0.49.1/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -821,8 +826,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= @@ -983,8 +988,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= -github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -1000,8 +1005,8 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= -github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= @@ -1015,14 +1020,13 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= -github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= @@ -1045,6 +1049,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -1186,6 +1192,8 @@ github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HK github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= @@ -1209,6 +1217,8 @@ github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vyg github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1324,8 +1334,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s= -github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1391,8 +1401,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1401,8 +1411,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1415,8 +1425,8 @@ github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH 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= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -1462,8 +1472,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1537,8 +1547,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxCHz3zSG67cLDDu8w3TkFm/FwiyiAWBhcidGXWH/0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= -github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk= -github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U= +github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8= +github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU= github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6BY= github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo= @@ -1584,8 +1594,8 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e h1:Vu41Q0Pv3yMdd+tcDW6QeEUIK2L+9ZrPrq8NAMrKSLc= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aRq5pxwgdJpAuP97SCjX1+Db32z/b0dggQ07FDF+fqE= -github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0= -github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY= +github.com/vmware/govmomi v0.36.1 h1:+E/nlfteQ8JvC0xhuKAfpnMsuIeGeGj7rJwqENUcWm8= +github.com/vmware/govmomi v0.36.1/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -1643,90 +1653,90 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a h1:pv7jzJUXo1wx1lpqLBjyvMPZ49MaY2FJzRPvzhCcyQM= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:DzYm9k0mVbvmGKTKxqCyRyRYxNofVCMLS8CKn8DvLpg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:7jHwA6IoBYR8p5ltqNm/hZUMgXHeL3Y8hXjsTe0XN+8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cwNkIhOcU9ltYj7Xrrn9/6+j6XZC8hMZcXU8/J0DzeE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a h1:4uN68N5k2JQkGJm2P1NHlX3rSWBAnpBpO03xO6dy58k= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:te/gJxX/rw7VYnXxmV4qjUv8YYeL1YNCAxgAI92sZoU= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a h1:3idLe4piHkcyEb6j7XyDfSxmScI0nhe5O/Wa/Molnkk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:PWKLpwkarM7db/ho+fF+X8ynke3EFiXfGXdDiCmKMPw= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -2161,8 +2171,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2186,8 +2196,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2243,10 +2253,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2273,8 +2283,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -2317,8 +2327,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -2350,27 +2358,27 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index b4858bebca21..ab10cc95e47e 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -6,15 +6,15 @@ dist: otelcol_version: 0.96.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.96.0 @@ -26,13 +26,13 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.96.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.96.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.96.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index b643fe6e6413..ce77b2765d29 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -32,27 +32,28 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.uber.org/goleak v1.3.0 golang.org/x/sys v0.18.0 ) require ( cloud.google.com/go/compute v1.24.0 // indirect - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect @@ -64,7 +65,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.50.2 // indirect + github.com/aws/aws-sdk-go v1.50.17 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -102,7 +103,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -137,7 +138,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -193,7 +194,7 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect @@ -214,32 +215,32 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/bbolt v1.3.9 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.49.0 // indirect @@ -265,18 +266,18 @@ require ( golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.16.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.166.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index 50190aef4a9d..6fb4026997af 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -21,8 +21,8 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= -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= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -91,8 +91,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.50.2 h1:/vS+Uhv2FPcqcTxBmgT3tvvN5q6pMAKu6QXltgXlGgo= -github.com/aws/aws-sdk-go v1.50.2/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.17 h1:KsbzUKDgGNlkDHGvoQDhiJ63a9jtZd+O+/s3pTOr/ns= +github.com/aws/aws-sdk-go v1.50.17/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= @@ -258,8 +258,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -397,8 +397,8 @@ github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2Wi github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4/go.mod h1:1yEQhaLb/cETXCqQmdh7lDjupNAReO7c83AHyK2dJ48= github.com/ionos-cloud/sdk-go/v6 v6.1.9 h1:Iq3VIXzeEbc8EbButuACgfLMiY5TPVWUPNrF+Vsddo4= github.com/ionos-cloud/sdk-go/v6 v6.1.9/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -569,8 +569,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -686,88 +686,88 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:7jHwA6IoBYR8p5ltqNm/hZUMgXHeL3Y8hXjsTe0XN+8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cwNkIhOcU9ltYj7Xrrn9/6+j6XZC8hMZcXU8/J0DzeE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a h1:4uN68N5k2JQkGJm2P1NHlX3rSWBAnpBpO03xO6dy58k= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:te/gJxX/rw7VYnXxmV4qjUv8YYeL1YNCAxgAI92sZoU= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a h1:3idLe4piHkcyEb6j7XyDfSxmScI0nhe5O/Wa/Molnkk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:PWKLpwkarM7db/ho+fF+X8ynke3EFiXfGXdDiCmKMPw= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -906,8 +906,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1058,8 +1058,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1134,8 +1134,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/cmd/oteltestbedcol/package_test.go b/cmd/oteltestbedcol/package_test.go new file mode 100644 index 000000000000..ca84920f45f1 --- /dev/null +++ b/cmd/oteltestbedcol/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package main + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")) +} diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod index 22fc69be3236..e53b934816bb 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.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 @@ -22,7 +22,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum index 03dac4c86c93..624aa950275d 100644 --- a/cmd/telemetrygen/go.sum +++ b/cmd/telemetrygen/go.sum @@ -95,16 +95,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 h1:f2jriWfOdldanBwS9jNBdeOKAQN7b4ugAMaNu1/1k9g= @@ -206,8 +206,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/cmd/telemetrygen/internal/e2etest/go.mod b/cmd/telemetrygen/internal/e2etest/go.mod index 97e63e7483b2..5c575dbc958e 100644 --- a/cmd/telemetrygen/internal/e2etest/go.mod +++ b/cmd/telemetrygen/internal/e2etest/go.mod @@ -6,14 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 ) 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 @@ -26,6 +25,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect @@ -46,22 +46,22 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect @@ -81,7 +81,7 @@ require ( golang.org/x/time v0.5.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/telemetrygen/internal/e2etest/go.sum b/cmd/telemetrygen/internal/e2etest/go.sum index f6cec7ac7a35..86d02406a369 100644 --- a/cmd/telemetrygen/internal/e2etest/go.sum +++ b/cmd/telemetrygen/internal/e2etest/go.sum @@ -1,9 +1,4 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -15,8 +10,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -24,8 +17,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -57,6 +48,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= @@ -124,48 +117,48 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -221,8 +214,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -257,8 +248,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -273,8 +262,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/cmd/telemetrygen/internal/metrics/exporter.go b/cmd/telemetrygen/internal/metrics/exporter.go index 5d77caf4eae8..00af1ea0d75a 100644 --- a/cmd/telemetrygen/internal/metrics/exporter.go +++ b/cmd/telemetrygen/internal/metrics/exporter.go @@ -8,7 +8,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" - "google.golang.org/grpc" "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common" ) @@ -18,9 +17,6 @@ import ( func grpcExporterOptions(cfg *Config) ([]otlpmetricgrpc.Option, error) { grpcExpOpt := []otlpmetricgrpc.Option{ otlpmetricgrpc.WithEndpoint(cfg.Endpoint()), - otlpmetricgrpc.WithDialOption( - grpc.WithBlock(), - ), } if cfg.Insecure { diff --git a/cmd/telemetrygen/internal/traces/exporter.go b/cmd/telemetrygen/internal/traces/exporter.go index dbcf55d7ab6e..b5913841454a 100644 --- a/cmd/telemetrygen/internal/traces/exporter.go +++ b/cmd/telemetrygen/internal/traces/exporter.go @@ -8,7 +8,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" - "google.golang.org/grpc" "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/common" ) @@ -18,9 +17,6 @@ import ( func grpcExporterOptions(cfg *Config) ([]otlptracegrpc.Option, error) { grpcExpOpt := []otlptracegrpc.Option{ otlptracegrpc.WithEndpoint(cfg.Endpoint()), - otlptracegrpc.WithDialOption( - grpc.WithBlock(), - ), } if cfg.Insecure { diff --git a/cmd/telemetrygen/package_test.go b/cmd/telemetrygen/package_test.go new file mode 100644 index 000000000000..5cd502ca564b --- /dev/null +++ b/cmd/telemetrygen/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package main + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 5ed57f836683..59e3f5e3a1e3 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.27.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.51.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index ee46169de221..952c87b8dd5f 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -58,8 +58,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= 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/confmap/provider/secretsmanagerprovider/go.mod b/confmap/provider/secretsmanagerprovider/go.mod index ee558666e5f8..14f9899e6646 100644 --- a/confmap/provider/secretsmanagerprovider/go.mod +++ b/confmap/provider/secretsmanagerprovider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.1 github.com/aws/smithy-go v1.20.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 ) require ( diff --git a/confmap/provider/secretsmanagerprovider/go.sum b/confmap/provider/secretsmanagerprovider/go.sum index bba54145de6a..9596dedf82ba 100644 --- a/confmap/provider/secretsmanagerprovider/go.sum +++ b/confmap/provider/secretsmanagerprovider/go.sum @@ -256,8 +256,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= 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/connector/countconnector/go.mod b/connector/countconnector/go.mod index 42507a59c120..67f39db944ea 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -60,7 +60,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index d37495f6607b..ef8b5ed42c35 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -78,20 +78,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -145,8 +145,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/connector/datadogconnector/README.md b/connector/datadogconnector/README.md index 58fdc97d1c69..25df928f1e4f 100644 --- a/connector/datadogconnector/README.md +++ b/connector/datadogconnector/README.md @@ -168,6 +168,11 @@ connectors: ## https://github.com/DataDog/datadog-agent/blob/505170c4ac8c3cbff1a61cf5f84b28d835c91058/pkg/trace/stats/concentrator.go#L55. # # peer_tags: ["tag"] + + ## @param resource_attributes_as_container_tags - enables the use of resource attributes as container tags - Optional + ## A list of resource attributes that should be used as container tags. + # + # resource_attributes_as_container_tags: ["could.availability_zone", "could.region"] ``` **NOTE**: `compute_stats_by_span_kind` and `peer_tags_aggregation` only work when the feature gate `connector.datadogconnector.performance` is enabled. See below for details on this feature gate. diff --git a/connector/datadogconnector/config.go b/connector/datadogconnector/config.go index f60c2222b384..1382f09c5740 100644 --- a/connector/datadogconnector/config.go +++ b/connector/datadogconnector/config.go @@ -63,6 +63,9 @@ type TracesConfig struct { // TraceBuffer specifies the number of Datadog Agent TracerPayloads to buffer before dropping. // The default value is 1000. TraceBuffer int `mapstructure:"trace_buffer"` + + // ResourceAttributesAsContainerTags specifies the list of resource attributes to be used as container tags. + ResourceAttributesAsContainerTags []string `mapstructure:"resource_attributes_as_container_tags"` } // Validate the configuration for errors. This is required by component.Config. diff --git a/connector/datadogconnector/connector.go b/connector/datadogconnector/connector.go index 27b26f46405a..703d55eef9ae 100644 --- a/connector/datadogconnector/connector.go +++ b/connector/datadogconnector/connector.go @@ -6,6 +6,7 @@ package datadogconnector // import "github.com/open-telemetry/opentelemetry-coll import ( "context" "fmt" + "time" pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" traceconfig "github.com/DataDog/datadog-agent/pkg/trace/config" @@ -13,10 +14,12 @@ import ( "github.com/DataDog/datadog-go/v5/statsd" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" + "github.com/patrickmn/go-cache" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + semconv "go.opentelemetry.io/collector/semconv/v1.17.0" "go.opentelemetry.io/otel/metric/noop" "go.uber.org/zap" @@ -36,16 +39,29 @@ type traceToMetricConnector struct { // from the agent to OTLP Metrics. translator *metrics.Translator + resourceAttrs map[string]string + containerTagCache *cache.Cache + // in specifies the channel through which the agent will output Stats Payloads // resulting from ingested traces. in chan *pb.StatsPayload // exit specifies the exit channel, which will be closed upon shutdown. exit chan struct{} + + // isStarted tracks whether Start() has been called. + isStarted bool } var _ component.Component = (*traceToMetricConnector)(nil) // testing that the connectorImp properly implements the type Component interface +// cacheExpiration is the time after which a container tag cache entry will expire +// and be removed from the cache. +var cacheExpiration = time.Minute * 5 + +// cacheCleanupInterval is the time after which the cache will be cleaned up. +var cacheCleanupInterval = time.Minute + // function to create a new connector func newTraceToMetricConnector(set component.TelemetrySettings, cfg component.Config, metricsConsumer consumer.Metrics, metricsClient statsd.ClientInterface, timingReporter timing.Reporter) (*traceToMetricConnector, error) { set.Logger.Info("Building datadog connector for traces to metrics") @@ -60,14 +76,22 @@ func newTraceToMetricConnector(set component.TelemetrySettings, cfg component.Co return nil, fmt.Errorf("failed to create metrics translator: %w", err) } + ctags := make(map[string]string, len(cfg.(*Config).Traces.ResourceAttributesAsContainerTags)) + for _, val := range cfg.(*Config).Traces.ResourceAttributesAsContainerTags { + ctags[val] = "" + } + ddtags := attributes.ContainerTagFromAttributes(ctags) + ctx := context.Background() return &traceToMetricConnector{ - logger: set.Logger, - agent: datadog.NewAgentWithConfig(ctx, getTraceAgentCfg(cfg.(*Config).Traces, attributesTranslator), in, metricsClient, timingReporter), - translator: trans, - in: in, - metricsConsumer: metricsConsumer, - exit: make(chan struct{}), + logger: set.Logger, + agent: datadog.NewAgentWithConfig(ctx, getTraceAgentCfg(cfg.(*Config).Traces, attributesTranslator), in, metricsClient, timingReporter), + translator: trans, + in: in, + metricsConsumer: metricsConsumer, + resourceAttrs: ddtags, + containerTagCache: cache.New(cacheExpiration, cacheCleanupInterval), + exit: make(chan struct{}), }, nil } @@ -80,6 +104,10 @@ func getTraceAgentCfg(cfg TracesConfig, attributesTranslator *attributes.Transla acfg.ComputeStatsBySpanKind = cfg.ComputeStatsBySpanKind acfg.PeerTagsAggregation = cfg.PeerTagsAggregation acfg.PeerTags = cfg.PeerTags + if len(cfg.ResourceAttributesAsContainerTags) > 0 { + acfg.Features["enable_cid_stats"] = struct{}{} + delete(acfg.Features, "disable_cid_stats") + } if v := cfg.TraceBuffer; v > 0 { acfg.TraceBuffer = v } @@ -91,11 +119,17 @@ func (c *traceToMetricConnector) Start(_ context.Context, _ component.Host) erro c.logger.Info("Starting datadogconnector") c.agent.Start() go c.run() + c.isStarted = true return nil } // Shutdown implements the component.Component interface. func (c *traceToMetricConnector) Shutdown(context.Context) error { + if !c.isStarted { + // Note: it is not necessary to manually close c.exit, c.in and c.agent.(*datadog.TraceAgent).exit channels as these are unused. + c.logger.Info("Requested shutdown, but not started, ignoring.") + return nil + } c.logger.Info("Shutting down datadog connector") c.logger.Info("Stopping datadog agent") // stop the agent and wait for the run loop to exit @@ -111,11 +145,55 @@ func (c *traceToMetricConnector) Capabilities() consumer.Capabilities { return consumer.Capabilities{MutatesData: false} } +func (c *traceToMetricConnector) populateContainerTagsCache(traces ptrace.Traces) { + for i := 0; i < traces.ResourceSpans().Len(); i++ { + rs := traces.ResourceSpans().At(i) + attrs := rs.Resource().Attributes() + containerID, ok := attrs.Get(semconv.AttributeContainerID) + if !ok { + continue + } + ddContainerTags := attributes.ContainerTagsFromResourceAttributes(attrs) + for attr := range c.resourceAttrs { + if val, ok := ddContainerTags[attr]; ok { + var cacheVal map[string]struct{} + if v, ok := c.containerTagCache.Get(containerID.AsString()); ok { + cacheVal = v.(map[string]struct{}) + cacheVal[fmt.Sprintf("%s:%s", attr, val)] = struct{}{} + } else { + cacheVal = make(map[string]struct{}) + cacheVal[fmt.Sprintf("%s:%s", attr, val)] = struct{}{} + c.containerTagCache.Set(containerID.AsString(), cacheVal, cache.DefaultExpiration) + } + + } + } + } +} + func (c *traceToMetricConnector) ConsumeTraces(ctx context.Context, traces ptrace.Traces) error { + c.populateContainerTagsCache(traces) c.agent.Ingest(ctx, traces) return nil } +func (c *traceToMetricConnector) enrichStatsPayload(stats *pb.StatsPayload) { + for _, stat := range stats.Stats { + if stat.ContainerID != "" { + if tags, ok := c.containerTagCache.Get(stat.ContainerID); ok { + tagList := tags.(map[string]struct{}) + for _, tag := range stat.Tags { + tagList[tag] = struct{}{} + } + stat.Tags = make([]string, 0, len(tagList)) + for tag := range tagList { + stat.Tags = append(stat.Tags, tag) + } + } + } + } +} + // run awaits incoming stats resulting from the agent's ingestion, converts them // to metrics and flushes them using the configured metrics exporter. func (c *traceToMetricConnector) run() { @@ -128,7 +206,13 @@ func (c *traceToMetricConnector) run() { } var mx pmetric.Metrics var err error + // Enrich the stats with container tags + if len(c.resourceAttrs) > 0 { + c.enrichStatsPayload(stats) + } + c.logger.Debug("Received stats payload", zap.Any("stats", stats)) + mx, err = c.translator.StatsToMetrics(stats) if err != nil { c.logger.Error("Failed to convert stats to metrics", zap.Error(err)) diff --git a/connector/datadogconnector/connector_test.go b/connector/datadogconnector/connector_test.go index ad3655c56a40..dfac3f7f4ad7 100644 --- a/connector/datadogconnector/connector_test.go +++ b/connector/datadogconnector/connector_test.go @@ -6,11 +6,22 @@ package datadogconnector import ( "context" "testing" + "time" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" + "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" + otlpmetrics "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "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/connector/connectortest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/ptrace" + semconv "go.opentelemetry.io/collector/semconv/v1.17.0" + "go.uber.org/zap" + "google.golang.org/protobuf/proto" ) var _ component.Component = (*traceToMetricConnector)(nil) // testing that the connectorImp properly implements the type Component interface @@ -41,3 +52,132 @@ func TestTraceToTraceConnector(t *testing.T) { _, ok := traceToTracesConnector.(*traceToTraceConnector) assert.True(t, ok) // checks if the created connector implements the connectorImp struct } + +var ( + spanStartTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 12, 321, time.UTC)) + spanEventTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 123, time.UTC)) + spanEndTimestamp = pcommon.NewTimestampFromTime(time.Date(2020, 2, 11, 20, 26, 13, 789, time.UTC)) +) + +func generateTrace() ptrace.Traces { + td := ptrace.NewTraces() + res := td.ResourceSpans().AppendEmpty().Resource() + res.Attributes().EnsureCapacity(3) + res.Attributes().PutStr("resource-attr1", "resource-attr-val1") + res.Attributes().PutStr("container.id", "my-container-id") + res.Attributes().PutStr("cloud.availability_zone", "my-zone") + res.Attributes().PutStr("cloud.region", "my-region") + + ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() + ss.EnsureCapacity(1) + fillSpanOne(ss.AppendEmpty()) + return td +} + +func fillSpanOne(span ptrace.Span) { + span.SetName("operationA") + span.SetStartTimestamp(spanStartTimestamp) + span.SetEndTimestamp(spanEndTimestamp) + span.SetDroppedAttributesCount(1) + span.SetTraceID([16]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}) + span.SetSpanID([8]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}) + evs := span.Events() + ev0 := evs.AppendEmpty() + ev0.SetTimestamp(spanEventTimestamp) + ev0.SetName("event-with-attr") + ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") + ev0.SetDroppedAttributesCount(2) + ev1 := evs.AppendEmpty() + ev1.SetTimestamp(spanEventTimestamp) + ev1.SetName("event") + ev1.SetDroppedAttributesCount(2) + span.SetDroppedEventsCount(1) + status := span.Status() + status.SetCode(ptrace.StatusCodeError) + status.SetMessage("status-cancelled") +} + +func TestContainerTags(t *testing.T) { + factory := NewFactory() + + creationParams := connectortest.NewNopCreateSettings() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.Traces.ResourceAttributesAsContainerTags = []string{semconv.AttributeCloudAvailabilityZone, semconv.AttributeCloudRegion} + metricsSink := &consumertest.MetricsSink{} + + traceToMetricsConnector, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, metricsSink) + assert.NoError(t, err) + + connector, ok := traceToMetricsConnector.(*traceToMetricConnector) + err = connector.Start(context.Background(), componenttest.NewNopHost()) + if err != nil { + t.Errorf("Error starting connector: %v", err) + return + } + defer func() { + _ = connector.Shutdown(context.Background()) + }() + + assert.True(t, ok) // checks if the created connector implements the connectorImp struct + trace1 := generateTrace() + + err = connector.ConsumeTraces(context.Background(), trace1) + assert.NoError(t, err) + + // Send two traces to ensure unique container tags are added to the cache + trace2 := generateTrace() + err = connector.ConsumeTraces(context.Background(), trace2) + assert.NoError(t, err) + // check if the container tags are added to the cache + assert.Equal(t, 1, len(connector.containerTagCache.Items())) + assert.Equal(t, 2, len(connector.containerTagCache.Items()["my-container-id"].Object.(map[string]struct{}))) + + for { + if len(metricsSink.AllMetrics()) > 0 { + break + } + time.Sleep(100 * time.Millisecond) + } + + // check if the container tags are added to the metrics + metrics := metricsSink.AllMetrics() + assert.Equal(t, 1, len(metrics)) + + ch := make(chan []byte, 100) + tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch) + _, err = tr.MapMetrics(context.Background(), metrics[0], nil) + require.NoError(t, err) + msg := <-ch + sp := &pb.StatsPayload{} + + err = proto.Unmarshal(msg, sp) + require.NoError(t, err) + + tags := sp.Stats[0].Tags + assert.Equal(t, 2, len(tags)) + assert.ElementsMatch(t, []string{"region:my-region", "zone:my-zone"}, tags) +} + +func newTranslatorWithStatsChannel(t *testing.T, logger *zap.Logger, ch chan []byte) *otlpmetrics.Translator { + options := []otlpmetrics.TranslatorOption{ + otlpmetrics.WithHistogramMode(otlpmetrics.HistogramModeDistributions), + + otlpmetrics.WithNumberMode(otlpmetrics.NumberModeCumulativeToDelta), + otlpmetrics.WithHistogramAggregations(), + otlpmetrics.WithStatsOut(ch), + } + + set := componenttest.NewNopTelemetrySettings() + set.Logger = logger + + attributesTranslator, err := attributes.NewTranslator(set) + require.NoError(t, err) + tr, err := otlpmetrics.NewTranslator( + set, + attributesTranslator, + options..., + ) + + require.NoError(t, err) + return tr +} diff --git a/connector/datadogconnector/examples/config.yaml b/connector/datadogconnector/examples/config.yaml index d67578e841e3..5d6f03374b67 100644 --- a/connector/datadogconnector/examples/config.yaml +++ b/connector/datadogconnector/examples/config.yaml @@ -5,21 +5,13 @@ receivers: endpoint: "localhost:4318" grpc: endpoint: "localhost:4317" - processors: batch: send_batch_size: 10 timeout: 5s tail_sampling: decision_wait: 1s - policies: [ - { - name: sample_flag, - type: boolean_attribute, - boolean_attribute: { key: sampled, value: true }, - } - ] - + policies: [{name: sample_flag, type: boolean_attribute, boolean_attribute: {key: sampled, value: true}}] connectors: datadog/connector: traces: @@ -28,7 +20,6 @@ connectors: ## all entries must be surrounded by double quotes and separated by commas. # ignore_resources: ["(GET|POST) /healthcheck"] - ## @param span_name_remappings - map of key/value pairs - optional ## A map of Datadog span operation name keys and preferred name valuues to update those names to. This can be used to ## automatically map Datadog Span Operation Names to an updated value, and is useful when a user wants to @@ -39,21 +30,18 @@ connectors: io.opentelemetry.javaagent.spring.client: spring.client instrumentation:express.server: express go.opentelemetry.io_contrib_instrumentation_net_http_otelhttp.client: http.client - ## @param span_name_as_resource_name - use OpenTelemetry semantic convention for span naming - optional ## Option created to maintain similarity with the OpenTelemetry semantic conventions as discussed in the issue below. ## https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions ## https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/1909 # span_name_as_resource_name: true - ## @param compute_stats_by_span_kind - enables APM stats computation based on `span.kind` - optional ## If set to true, enables an additional stats computation check on spans to see they have an eligible `span.kind` (server, consumer, client, producer). ## If enabled, a span with an eligible `span.kind` will have stats computed. If disabled, only top-level and measured spans will have stats computed. ## NOTE: For stats computed from OTel traces, only top-level spans are considered when this option is off. # compute_stats_by_span_kind: true - ## @param peer_tags_aggregation - enables aggregation of peer related tags in Datadog exporter - optional ## If set to true, enables aggregation of peer related tags (e.g., `peer.service`, `db.instance`, etc.) in Datadog exporter. ## If disabled, aggregated trace stats will not include these tags as dimensions on trace metrics. @@ -66,20 +54,21 @@ connectors: ## The default list of peer tags can be found in https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/stats/concentrator.go. # peer_tags_aggregation: true - ## @param trace_buffer - specifies the number of outgoing trace payloads to buffer before dropping - optional ## If unset, the default value is 1000. ## If you start seeing log messages like `Payload in channel full. Dropped 1 payload.` in the datadog exporter, consider ## setting a higher `trace_buffer` to avoid traces being dropped. # trace_buffer: 500 - ## @param peer_tags - [BETA] Optional list of supplementary peer tags that go beyond the defaults. The Datadog backend validates all tags ## and will drop ones that are unapproved. The default set of peer tags can be found at ## https://github.com/DataDog/datadog-agent/blob/505170c4ac8c3cbff1a61cf5f84b28d835c91058/pkg/trace/stats/concentrator.go#L55. # peer_tags: ["tag"] - + ## @param resource_attributes_as_container_tags - enables the use of resource attributes as container tags - Optional + ## A list of resource attributes that should be used as container tags. + # + resource_attributes_as_container_tags: ["could.availability_zone", "could.region"] exporters: debug: verbosity: detailed @@ -88,7 +77,6 @@ exporters: key: ${env:DD_API_KEY} traces: trace_buffer: 100 - service: pipelines: traces: @@ -102,4 +90,4 @@ service: metrics: receivers: [datadog/connector] processors: [batch] - exporters: [datadog, debug] \ No newline at end of file + exporters: [datadog, debug] diff --git a/connector/datadogconnector/generated_component_test.go b/connector/datadogconnector/generated_component_test.go new file mode 100644 index 000000000000..bf777c39bb36 --- /dev/null +++ b/connector/datadogconnector/generated_component_test.go @@ -0,0 +1,68 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package datadogconnector + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/connector/connectortest" + "go.opentelemetry.io/collector/consumer/consumertest" +) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) + }{ + + { + name: "traces_to_metrics", + createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesToMetrics(ctx, set, cfg, consumertest.NewNop()) + }, + }, + + { + name: "traces_to_traces", + createFn: func(ctx context.Context, set connector.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesToTraces(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(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + t.Run(test.name+"-lifecycle", func(t *testing.T) { + firstConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + require.NoError(t, err) + require.NoError(t, firstConnector.Start(context.Background(), host)) + require.NoError(t, firstConnector.Shutdown(context.Background())) + secondConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondConnector.Start(context.Background(), host)) + require.NoError(t, secondConnector.Shutdown(context.Background())) + }) + } +} diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index e56f8f70bffd..4c2fa4272316 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -11,21 +11,25 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0 + github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 + google.golang.org/protobuf v1.33.0 ) require ( @@ -77,7 +81,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -116,15 +120,14 @@ require ( github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/outcaste-io/ristretto v0.2.1 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.24.2 // indirect @@ -137,31 +140,29 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -182,25 +183,24 @@ require ( golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index da50b598e167..85a5e7fa9b0d 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -268,8 +268,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -509,12 +509,12 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -590,82 +590,82 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -793,8 +793,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -913,8 +913,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -968,8 +968,8 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -1015,14 +1015,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/connector/datadogconnector/metadata.yaml b/connector/datadogconnector/metadata.yaml index 0f6651c16612..7feb71b52186 100644 --- a/connector/datadogconnector/metadata.yaml +++ b/connector/datadogconnector/metadata.yaml @@ -11,5 +11,3 @@ status: emeritus: [gbbr] tests: - skip_lifecycle: true - skip_shutdown: true diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index 27886b1ec6e7..a31751cfdca2 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -7,17 +7,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index e7bfd29a929a..81a01196cc93 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,22 +64,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/connector/failoverconnector/go.mod b/connector/failoverconnector/go.mod index 91de925a8642..b402558ab913 100644 --- a/connector/failoverconnector/go.mod +++ b/connector/failoverconnector/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -48,7 +49,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/failoverconnector/go.sum b/connector/failoverconnector/go.sum index 0aafbb59b542..f94474defe68 100644 --- a/connector/failoverconnector/go.sum +++ b/connector/failoverconnector/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index 5e4d3c3820ce..d6c56cb37ad2 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -55,7 +55,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index a00ff4ce8b31..d5088264d9bc 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -78,20 +78,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -145,8 +145,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/connector/servicegraphconnector/README.md b/connector/servicegraphconnector/README.md index 191158d63d48..00f0a96ad2df 100644 --- a/connector/servicegraphconnector/README.md +++ b/connector/servicegraphconnector/README.md @@ -153,7 +153,7 @@ receivers: connectors: servicegraph: - latency_histogram_buckets: [1,2,3,4,5] + latency_histogram_buckets: [100ms, 250ms, 1s, 5s, 10s] dimensions: - dimension-1 - dimension-2 diff --git a/connector/servicegraphconnector/go.mod b/connector/servicegraphconnector/go.mod index 92434da51588..3468124582ca 100644 --- a/connector/servicegraphconnector/go.mod +++ b/connector/servicegraphconnector/go.mod @@ -4,17 +4,17 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -53,24 +53,24 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -92,7 +92,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index c5305d38649c..e28cd6a37e31 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -107,8 +107,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -133,58 +133,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -263,7 +263,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -300,8 +300,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/connector/spanmetricsconnector/README.md b/connector/spanmetricsconnector/README.md index 98414e7896c0..3c0773187d4d 100644 --- a/connector/spanmetricsconnector/README.md +++ b/connector/spanmetricsconnector/README.md @@ -117,6 +117,7 @@ The following settings can be optionally configured: One of either `AGGREGATION_TEMPORALITY_CUMULATIVE` or `AGGREGATION_TEMPORALITY_DELTA`. - `namespace`: Defines the namespace of the generated metrics. If `namespace` provided, generated metric name will be added `namespace.` prefix. - `metrics_flush_interval` (default: `15s`): Defines the flush interval of the generated metrics. +- `metrics_expiration` (default: `0`): Defines the expiration time as `time.Duration`, after which, if no new spans are received, metrics will no longer be exported. Setting to `0` means the metrics will never expire (default behavior). - `exemplars`: Use to configure how to attach exemplars to histograms - `enabled` (default: `false`): enabling will add spans as Exemplars. - `events`: Use to configure the events metric. @@ -154,6 +155,7 @@ connectors: dimensions_cache_size: 1000 aggregation_temporality: "AGGREGATION_TEMPORALITY_CUMULATIVE" metrics_flush_interval: 15s + metrics_expiration: 5m events: enabled: true dimensions: diff --git a/connector/spanmetricsconnector/config.go b/connector/spanmetricsconnector/config.go index 66174e34fccb..c379a2c38fd9 100644 --- a/connector/spanmetricsconnector/config.go +++ b/connector/spanmetricsconnector/config.go @@ -67,6 +67,10 @@ type Config struct { // MetricsEmitInterval is the time period between when metrics are flushed or emitted to the configured MetricsExporter. MetricsFlushInterval time.Duration `mapstructure:"metrics_flush_interval"` + // MetricsExpiration is the time period after which, if no new spans are received, metrics are considered stale and will no longer be exported. + // Default value (0) means that the metrics will never expire. + MetricsExpiration time.Duration `mapstructure:"metrics_expiration"` + // Namespace is the namespace of the metrics emitted by the connector. Namespace string `mapstructure:"namespace"` @@ -127,6 +131,14 @@ func (c Config) Validate() error { return errors.New("use either `explicit` or `exponential` buckets histogram") } + if c.MetricsFlushInterval < 0 { + return fmt.Errorf("invalid metrics_flush_interval: %v, the duration should be positive", c.MetricsFlushInterval) + } + + if c.MetricsExpiration < 0 { + return fmt.Errorf("invalid metrics_expiration: %v, the duration should be positive", c.MetricsExpiration) + } + return nil } diff --git a/connector/spanmetricsconnector/config_test.go b/connector/spanmetricsconnector/config_test.go index 18458fc7cd98..97e5a2a15eea 100644 --- a/connector/spanmetricsconnector/config_test.go +++ b/connector/spanmetricsconnector/config_test.go @@ -88,6 +88,10 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "invalid_histogram_unit"), errorMessage: "unknown Unit \"h\"", }, + { + id: component.NewIDWithName(metadata.Type, "invalid_metrics_expiration"), + errorMessage: "the duration should be positive", + }, { id: component.NewIDWithName(metadata.Type, "exemplars_enabled"), expected: &Config{ diff --git a/connector/spanmetricsconnector/connector.go b/connector/spanmetricsconnector/connector.go index 5a001c42dd38..702c1f7319b4 100644 --- a/connector/spanmetricsconnector/connector.go +++ b/connector/spanmetricsconnector/connector.go @@ -81,6 +81,8 @@ type resourceMetrics struct { attributes pcommon.Map // startTimestamp captures when the first data points for this resource are recorded. startTimestamp pcommon.Timestamp + // lastSeen captures when the last data points for this resource were recorded. + lastSeen time.Time } type dimension struct { @@ -289,12 +291,25 @@ func (p *connectorImp) resetState() { p.resourceMetrics.RemoveEvictedItems() p.metricKeyToDimensions.RemoveEvictedItems() - // Exemplars are only relevant to this batch of traces, so must be cleared within the lock - if p.config.Histogram.Disable { + // If no histogram and no metrics expiration is configured, we can skip the remaining operations. + // Enabling either of these features requires to go over resource metrics and do operation on each. + if p.config.Histogram.Disable && p.config.MetricsExpiration == 0 { return } - p.resourceMetrics.ForEach(func(_ resourceKey, m *resourceMetrics) { - m.histograms.Reset(true) + + now := time.Now() + p.resourceMetrics.ForEach(func(k resourceKey, m *resourceMetrics) { + // Exemplars are only relevant to this batch of traces, so must be cleared within the lock + if !p.config.Histogram.Disable { + m.histograms.Reset(true) + } + + // If metrics expiration is configured, remove metrics that haven't been seen for longer than the expiration period. + if p.config.MetricsExpiration > 0 { + if now.Sub(m.lastSeen) >= p.config.MetricsExpiration { + p.resourceMetrics.Remove(k) + } + } }) } @@ -425,6 +440,12 @@ func (p *connectorImp) getOrCreateResourceMetrics(attr pcommon.Map) *resourceMet } p.resourceMetrics.Add(key, v) } + + // If expiration is enabled, track the last seen time. + if p.config.MetricsExpiration > 0 { + v.lastSeen = time.Now() + } + return v } diff --git a/connector/spanmetricsconnector/connector_test.go b/connector/spanmetricsconnector/connector_test.go index 98a2377dfa80..669e14be02b2 100644 --- a/connector/spanmetricsconnector/connector_test.go +++ b/connector/spanmetricsconnector/connector_test.go @@ -452,6 +452,50 @@ func disabledHistogramsConfig() HistogramConfig { } } +func newConnectorImp(defaultNullValue *string, histogramConfig func() HistogramConfig, exemplarsConfig func() ExemplarsConfig, eventsConfig func() EventsConfig, temporality string, expiration time.Duration, resourceMetricsKeyAttributes []string, excludedDimensions ...string) (*connectorImp, *clock.Mock, error) { + cfg := &Config{ + AggregationTemporality: temporality, + Histogram: histogramConfig(), + Exemplars: exemplarsConfig(), + ExcludeDimensions: excludedDimensions, + DimensionsCacheSize: dimensionsCacheSize, + ResourceMetricsCacheSize: resourceMetricsCacheSize, + ResourceMetricsKeyAttributes: resourceMetricsKeyAttributes, + Dimensions: []Dimension{ + // Set nil defaults to force a lookup for the attribute in the span. + {stringAttrName, nil}, + {intAttrName, nil}, + {doubleAttrName, nil}, + {boolAttrName, nil}, + {mapAttrName, nil}, + {arrayAttrName, nil}, + {nullAttrName, defaultNullValue}, + // Add a default value for an attribute that doesn't exist in a span + {notInSpanAttrName0, stringp("defaultNotInSpanAttrVal")}, + // Leave the default value unset to test that this dimension should not be added to the metric. + {notInSpanAttrName1, nil}, + // Add a resource attribute to test "process" attributes like IP, host, region, cluster, etc. + {regionResourceAttrName, nil}, + }, + Events: eventsConfig(), + MetricsExpiration: expiration, + } + + mockClock := clock.NewMock(time.Now()) + ticker := mockClock.NewTicker(time.Nanosecond) + + c, err := newConnector(zap.NewNop(), cfg, ticker) + if err != nil { + return nil, nil, err + } + c.metricsConsumer = consumertest.NewNop() + return c, mockClock, nil +} + +func stringp(str string) *string { + return &str +} + func TestBuildKeySameServiceNameCharSequence(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) @@ -594,14 +638,14 @@ func TestConcurrentShutdown(t *testing.T) { // Prepare ctx := context.Background() core, observedLogs := observer.New(zapcore.InfoLevel) - logger := zap.New(core) - - mockClock := clock.NewMock(time.Now()) - ticker := mockClock.NewTicker(time.Nanosecond) // Test - p := newConnectorImp(t, new(consumertest.MetricsSink), nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, logger, ticker) - err := p.Start(ctx, componenttest.NewNopHost()) + p, _, err := newConnectorImp(nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) + // Override the default no-op consumer and logger for testing. + p.metricsConsumer = new(consumertest.MetricsSink) + p.logger = zap.New(core) + err = p.Start(ctx, componenttest.NewNopHost()) require.NoError(t, err) // Allow goroutines time to start. @@ -629,11 +673,10 @@ func TestConcurrentShutdown(t *testing.T) { return len(allLogs) > 0 }, time.Second, time.Millisecond*10) - // Building spanmetrics connector... // Starting spanmetricsconnector... // Shutting down spanmetricsconnector... // Stopping ticker. - assert.Len(t, allLogs, 4) + assert.Len(t, allLogs, 3) } func TestConnectorCapabilities(t *testing.T) { @@ -643,6 +686,7 @@ func TestConnectorCapabilities(t *testing.T) { // Test c, err := newConnector(zaptest.NewLogger(t), cfg, nil) + // Override the default no-op consumer for testing. c.metricsConsumer = new(consumertest.MetricsSink) assert.NoError(t, err) caps := c.Capabilities() @@ -674,16 +718,17 @@ func TestConsumeMetricsErrors(t *testing.T) { logger := zap.New(core) var wg sync.WaitGroup - mcon := &errConsumer{ + p, mockClock, err := newConnectorImp(nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) + // Override the default no-op consumer and logger for testing. + p.metricsConsumer = &errConsumer{ wg: &wg, fakeErr: fakeErr, } - mockClock := clock.NewMock(time.Now()) - ticker := mockClock.NewTicker(time.Nanosecond) - p := newConnectorImp(t, mcon, nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, logger, ticker) + p.logger = logger ctx := metadata.NewIncomingContext(context.Background(), nil) - err := p.Start(ctx, componenttest.NewNopHost()) + err = p.Start(ctx, componenttest.NewNopHost()) defer func() { sdErr := p.Shutdown(ctx); require.NoError(t, sdErr) }() require.NoError(t, err) @@ -838,14 +883,13 @@ func TestConsumeTraces(t *testing.T) { // Prepare mcon := &consumertest.MetricsSink{} - - mockClock := clock.NewMock(time.Now()) - ticker := mockClock.NewTicker(time.Nanosecond) - - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), tc.histogramConfig, tc.exemplarConfig, disabledEventsConfig, tc.aggregationTemporality, []string{}, zaptest.NewLogger(t), ticker) + p, mockClock, err := newConnectorImp(stringp("defaultNullValue"), tc.histogramConfig, tc.exemplarConfig, disabledEventsConfig, tc.aggregationTemporality, 0, []string{}) + require.NoError(t, err) + // Override the default no-op consumer with metrics sink for testing. + p.metricsConsumer = mcon ctx := metadata.NewIncomingContext(context.Background(), nil) - err := p.Start(ctx, componenttest.NewNopHost()) + err = p.Start(ctx, componenttest.NewNopHost()) defer func() { sdErr := p.Shutdown(ctx); require.NoError(t, sdErr) }() require.NoError(t, err) @@ -866,9 +910,8 @@ func TestConsumeTraces(t *testing.T) { } func TestMetricKeyCache(t *testing.T) { - mcon := consumertest.NewNop() - - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(t), nil) + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) traces := buildSampleTrace() // Test @@ -877,7 +920,7 @@ func TestMetricKeyCache(t *testing.T) { // 0 key was cached at beginning assert.Zero(t, p.metricKeyToDimensions.Len()) - err := p.ConsumeTraces(ctx, traces) + err = p.ConsumeTraces(ctx, traces) // Validate require.NoError(t, err) // 2 key was cached, 1 key was evicted and cleaned after the processing @@ -896,9 +939,8 @@ func TestMetricKeyCache(t *testing.T) { } func TestResourceMetricsCache(t *testing.T) { - mcon := consumertest.NewNop() - - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(t), nil) + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) // Test ctx := metadata.NewIncomingContext(context.Background(), nil) @@ -906,7 +948,7 @@ func TestResourceMetricsCache(t *testing.T) { // 0 resources in the beginning assert.Zero(t, p.resourceMetrics.Len()) - err := p.ConsumeTraces(ctx, buildSampleTrace()) + err = p.ConsumeTraces(ctx, buildSampleTrace()) // Validate require.NoError(t, err) assert.Equal(t, 2, p.resourceMetrics.Len()) @@ -933,14 +975,34 @@ func TestResourceMetricsCache(t *testing.T) { assert.Equal(t, resourceMetricsCacheSize, p.resourceMetrics.Len()) } -func TestResourceMetricsKeyAttributes(t *testing.T) { - mcon := consumertest.NewNop() +func TestResourceMetricsExpiration(t *testing.T) { + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 1*time.Millisecond, []string{}) + require.NoError(t, err) + + // Test + ctx := metadata.NewIncomingContext(context.Background(), nil) + // 0 resources in the beginning + assert.Zero(t, p.resourceMetrics.Len()) + + err = p.ConsumeTraces(ctx, buildSampleTrace()) + // Validate + require.NoError(t, err) + assert.Equal(t, 2, p.resourceMetrics.Len()) + + // consume another batch of traces for the same resources + err = p.ConsumeTraces(ctx, buildSampleTrace()) + require.NoError(t, err) + assert.Equal(t, 2, p.resourceMetrics.Len()) +} + +func TestResourceMetricsKeyAttributes(t *testing.T) { resourceMetricsKeyAttributes := []string{ "service.name", } - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, resourceMetricsKeyAttributes, zaptest.NewLogger(t), nil) + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, resourceMetricsKeyAttributes) + require.NoError(t, err) // Test ctx := metadata.NewIncomingContext(context.Background(), nil) @@ -948,7 +1010,7 @@ func TestResourceMetricsKeyAttributes(t *testing.T) { // 0 resources in the beginning assert.Zero(t, p.resourceMetrics.Len()) - err := p.ConsumeTraces(ctx, buildSampleTrace()) + err = p.ConsumeTraces(ctx, buildSampleTrace()) // Validate require.NoError(t, err) assert.Equal(t, 2, p.resourceMetrics.Len()) @@ -977,9 +1039,8 @@ func TestResourceMetricsKeyAttributes(t *testing.T) { func BenchmarkConnectorConsumeTraces(b *testing.B) { // Prepare - mcon := consumertest.NewNop() - - conn := newConnectorImp(nil, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(b), nil) + conn, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(b, err) traces := buildSampleTrace() @@ -991,15 +1052,15 @@ func BenchmarkConnectorConsumeTraces(b *testing.B) { } func TestExcludeDimensionsConsumeTraces(t *testing.T) { - mcon := consumertest.NewNop() excludeDimensions := []string{"span.kind", "span.name", "totallyWrongNameDoesNotAffectAnything"} - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(t), nil, excludeDimensions...) + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, excludeDimensions...) + require.NoError(t, err) traces := buildSampleTrace() // Test ctx := metadata.NewIncomingContext(context.Background(), nil) - err := p.ConsumeTraces(ctx, traces) + err = p.ConsumeTraces(ctx, traces) require.NoError(t, err) metrics := p.buildMetrics() @@ -1042,44 +1103,6 @@ func TestExcludeDimensionsConsumeTraces(t *testing.T) { } -func newConnectorImp(t *testing.T, mcon consumer.Metrics, defaultNullValue *string, histogramConfig func() HistogramConfig, exemplarsConfig func() ExemplarsConfig, eventsConfig func() EventsConfig, temporality string, resourceMetricsKeyAttributes []string, logger *zap.Logger, ticker *clock.Ticker, excludedDimensions ...string) *connectorImp { - - cfg := &Config{ - AggregationTemporality: temporality, - Histogram: histogramConfig(), - Exemplars: exemplarsConfig(), - ExcludeDimensions: excludedDimensions, - DimensionsCacheSize: dimensionsCacheSize, - ResourceMetricsCacheSize: resourceMetricsCacheSize, - ResourceMetricsKeyAttributes: resourceMetricsKeyAttributes, - Dimensions: []Dimension{ - // Set nil defaults to force a lookup for the attribute in the span. - {stringAttrName, nil}, - {intAttrName, nil}, - {doubleAttrName, nil}, - {boolAttrName, nil}, - {mapAttrName, nil}, - {arrayAttrName, nil}, - {nullAttrName, defaultNullValue}, - // Add a default value for an attribute that doesn't exist in a span - {notInSpanAttrName0, stringp("defaultNotInSpanAttrVal")}, - // Leave the default value unset to test that this dimension should not be added to the metric. - {notInSpanAttrName1, nil}, - // Add a resource attribute to test "process" attributes like IP, host, region, cluster, etc. - {regionResourceAttrName, nil}, - }, - Events: eventsConfig(), - } - c, err := newConnector(logger, cfg, ticker) - require.NoError(t, err) - c.metricsConsumer = mcon - return c -} - -func stringp(str string) *string { - return &str -} - func TestConnectorConsumeTracesEvictedCacheKey(t *testing.T) { // Prepare traces0 := ptrace.NewTraces() @@ -1159,14 +1182,14 @@ func TestConnectorConsumeTracesEvictedCacheKey(t *testing.T) { var wg sync.WaitGroup wg.Add(len(wantDataPointCounts)) - mockClock := clock.NewMock(time.Now()) - ticker := mockClock.NewTicker(time.Nanosecond) - // Note: default dimension key cache size is 2. - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(t), ticker) + p, mockClock, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) + // Override the default no-op consumer with metrics sink for testing. + p.metricsConsumer = mcon ctx := metadata.NewIncomingContext(context.Background(), nil) - err := p.Start(ctx, componenttest.NewNopHost()) + err = p.Start(ctx, componenttest.NewNopHost()) defer func() { sdErr := p.Shutdown(ctx); require.NoError(t, sdErr) }() require.NoError(t, err) @@ -1201,6 +1224,87 @@ func TestConnectorConsumeTracesEvictedCacheKey(t *testing.T) { } } +func TestConnectorConsumeTracesExpiredMetrics(t *testing.T) { + // Prepare + traces0 := ptrace.NewTraces() + + initServiceSpans( + serviceSpans{ + serviceName: "service-a", + spans: []span{ + { + name: "/ping", + kind: ptrace.SpanKindServer, + statusCode: ptrace.StatusCodeOk, + }, + }, + }, traces0.ResourceSpans().AppendEmpty()) + initServiceSpans( + serviceSpans{ + serviceName: "service-b", + spans: []span{ + { + name: "/ping", + kind: ptrace.SpanKindServer, + statusCode: ptrace.StatusCodeError, + }, + }, + }, traces0.ResourceSpans().AppendEmpty()) + + traces1 := ptrace.NewTraces() + + initServiceSpans( + serviceSpans{ + serviceName: "service-x", + spans: []span{ + { + name: "/ping", + kind: ptrace.SpanKindServer, + statusCode: ptrace.StatusCodeOk, + }, + }, + }, traces1.ResourceSpans().AppendEmpty()) + + mcon := &consumertest.MetricsSink{} + + // Creating a connector with a very short metricsTTL to ensure that the metrics are expired. + p, mockClock, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 1*time.Nanosecond, []string{}) + require.NoError(t, err) + // Override the default no-op consumer with metrics sink for testing. + p.metricsConsumer = mcon + + ctx := metadata.NewIncomingContext(context.Background(), nil) + err = p.Start(ctx, componenttest.NewNopHost()) + defer func() { sdErr := p.Shutdown(ctx); require.NoError(t, sdErr) }() + require.NoError(t, err) + + // Test expiration by sending three batches of traces, with the second and third batch being identical. + // On firsts test run, we should see only data points for traces #0 (= 4 data points) + // On second test run, we want to see both data points for traces #0 and #1 (= 6 data points) + // On third test run, we want to see only data points for traces #1, since metrics for traces #0 should be expired (= 2 data points) + wantedDataPointCounts := []int{4, 6, 2} + for i, traces := range []ptrace.Traces{traces0, traces1, traces1} { + // Test + err = p.ConsumeTraces(ctx, traces) + require.NoError(t, err) + + // Allow time for metrics aggregation to complete. + time.Sleep(time.Millisecond) + + // Trigger flush. + mockClock.Add(time.Nanosecond) + + // Allow time for metrics flush to complete. + time.Sleep(time.Millisecond) + + // Verify. + require.Equal(t, wantedDataPointCounts[i], mcon.AllMetrics()[0].DataPointCount()) + + // Reset so we can verify the next set of metrics from scratch. + mcon.Reset() + } +} + func TestBuildMetricName(t *testing.T) { tests := []struct { namespace string @@ -1416,14 +1520,14 @@ func TestSpanMetrics_Events(t *testing.T) { } } func TestExemplarsForSumMetrics(t *testing.T) { - mcon := consumertest.NewNop() - p := newConnectorImp(t, mcon, stringp("defaultNullValue"), explicitHistogramsConfig, enabledExemplarsConfig, enabledEventsConfig, cumulative, []string{}, zaptest.NewLogger(t), nil) + p, _, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, enabledExemplarsConfig, enabledEventsConfig, cumulative, 0, []string{}) + require.NoError(t, err) traces := buildSampleTrace() // Test ctx := metadata.NewIncomingContext(context.Background(), nil) - err := p.ConsumeTraces(ctx, traces) + err = p.ConsumeTraces(ctx, traces) require.NoError(t, err) metrics := p.buildMetrics() diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index ce69029f76a9..ee26c5be6255 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -31,6 +31,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -44,8 +45,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index ff9e41c22f68..ceb6d3e10751 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -68,22 +70,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -135,8 +137,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/connector/spanmetricsconnector/internal/cache/cache.go b/connector/spanmetricsconnector/internal/cache/cache.go index 23513298339c..2559d42eadf7 100644 --- a/connector/spanmetricsconnector/internal/cache/cache.go +++ b/connector/spanmetricsconnector/internal/cache/cache.go @@ -64,6 +64,11 @@ func (c *Cache[K, V]) Get(key K) (V, bool) { return val, ok } +// Remove removes a key from the cache if it exists. +func (c *Cache[K, V]) Remove(key K) bool { + return c.lru.Remove(key) +} + // Len returns the number of items in the cache. func (c *Cache[K, V]) Len() int { return c.lru.Len() diff --git a/connector/spanmetricsconnector/testdata/config.yaml b/connector/spanmetricsconnector/testdata/config.yaml index ae6faab493b9..31da9ccd4aa5 100644 --- a/connector/spanmetricsconnector/testdata/config.yaml +++ b/connector/spanmetricsconnector/testdata/config.yaml @@ -58,6 +58,9 @@ spanmetrics/invalid_histogram_unit: histogram: unit: "h" +spanmetrics/invalid_metrics_expiration: + metrics_expiration: -20s + # exemplars enabled spanmetrics/exemplars_enabled: exemplars: diff --git a/examples/couchbase/docker-compose.yaml b/examples/couchbase/docker-compose.yaml index 119abb8d7727..1a7a2473e2cb 100644 --- a/examples/couchbase/docker-compose.yaml +++ b/examples/couchbase/docker-compose.yaml @@ -17,7 +17,7 @@ services: depends_on: - couchbase prometheus: - image: prom/prometheus:v2.50.1 + image: prom/prometheus:v2.51.0 volumes: - ./prometheus-config.yaml:/etc/prometheus/prometheus.yml ports: diff --git a/examples/demo/client/go.mod b/examples/demo/client/go.mod index 51abdecbf651..2baf241b5d64 100644 --- a/examples/demo/client/go.mod +++ b/examples/demo/client/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/examples/demo/c go 1.21 require ( - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 @@ -11,7 +11,7 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 - google.golang.org/grpc v1.61.1 + google.golang.org/grpc v1.62.1 ) require ( @@ -23,12 +23,12 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.opentelemetry.io/proto/otlp v1.1.0 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) retract ( diff --git a/examples/demo/client/go.sum b/examples/demo/client/go.sum index 24b7238554cd..c20f29b0b9e2 100644 --- a/examples/demo/client/go.sum +++ b/examples/demo/client/go.sum @@ -21,8 +21,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 h1:f2jriWfOdldanBwS9jNBdeOKAQN7b4ugAMaNu1/1k9g= @@ -43,24 +43,24 @@ go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxi go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +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/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY= -google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM= -google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= -google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= -google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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/examples/demo/server/go.mod b/examples/demo/server/go.mod index ac7082de75fb..a7f2d23dd501 100644 --- a/examples/demo/server/go.mod +++ b/examples/demo/server/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/examples/demo/s go 1.21 require ( - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 - google.golang.org/grpc v1.61.1 + google.golang.org/grpc v1.62.1 ) require ( @@ -23,12 +23,12 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect go.opentelemetry.io/proto/otlp v1.1.0 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) retract ( diff --git a/examples/demo/server/go.sum b/examples/demo/server/go.sum index 24b7238554cd..c20f29b0b9e2 100644 --- a/examples/demo/server/go.sum +++ b/examples/demo/server/go.sum @@ -21,8 +21,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 h1:f2jriWfOdldanBwS9jNBdeOKAQN7b4ugAMaNu1/1k9g= @@ -43,24 +43,24 @@ go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxi go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +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/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos= -google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY= -google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM= -google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= -google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= -google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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/exporter/alertmanagerexporter/README.md b/exporter/alertmanagerexporter/README.md index b33b3505f2a7..3ef900df2304 100644 --- a/exporter/alertmanagerexporter/README.md +++ b/exporter/alertmanagerexporter/README.md @@ -10,7 +10,7 @@ [development]: https://github.com/open-telemetry/opentelemetry-collector#development -Exports OTEL Events (SpanEvent in Tracing added by AddEvent API) as Alerts to [Alertmanager] (https://prometheus.io/docs/alerting/latest/alertmanager/) back-end to notify Errors or Change events. +Exports OTEL Events (SpanEvent in Tracing added by AddEvent API) as Alerts to [Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/) back-end to notify Errors or Change events. Supported pipeline types: traces @@ -18,7 +18,7 @@ Supported pipeline types: traces The following settings are required: -- `endpoint` : Alertmanager endpoint to send events +- `endpoint`: Alertmanager endpoint to send events - `severity`: Default severity for Alerts @@ -28,8 +28,8 @@ The following settings are optional: - [HTTP settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md) - [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md) - `generator_url` is the source of the alerts to be used in Alertmanager's payload. The default value is "opentelemetry-collector", and can be set to the URL of the opentelemetry collector. -- `severity_attribute`is the spanevent Attribute name which can be used instead of default severity string in Alert payload - eg: If severity_attribute is set to "foo" and the SpanEvent has an attribute called foo, foo's attribute value will be used as the severity value for that particular Alert generated from the SpanEvent. +- `severity_attribute` is the SpanEvent Attribute name which can be used instead of default severity string in Alert payload + e.g.: If `severity_attribute` is set to "foo" and the SpanEvent has an attribute called foo, foo's attribute value will be used as the severity value for that particular Alert generated from the SpanEvent. Example config: @@ -55,4 +55,4 @@ exporters: max_interval: 60s max_elapsed_time: 10m generator_url: "opentelemetry-collector" -``` \ No newline at end of file +``` diff --git a/exporter/alertmanagerexporter/alertmanager_exporter_test.go b/exporter/alertmanagerexporter/alertmanager_exporter_test.go index 438c44824fe7..382e541fa716 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter_test.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter_test.go @@ -347,7 +347,7 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -370,8 +370,8 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, }, @@ -383,8 +383,8 @@ func TestClientConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/alertmanagerexporter/config_test.go b/exporter/alertmanagerexporter/config_test.go index 41a3acda1b42..3583349ac1df 100644 --- a/exporter/alertmanagerexporter/config_test.go +++ b/exporter/alertmanagerexporter/config_test.go @@ -69,8 +69,8 @@ func TestLoadConfig(t *testing.T) { "another": "somevalue", }, Endpoint: "a.new.alertmanager.target:9093", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, }, diff --git a/exporter/alertmanagerexporter/generated_component_test.go b/exporter/alertmanagerexporter/generated_component_test.go index c4f131b980fd..3cc537978d84 100644 --- a/exporter/alertmanagerexporter/generated_component_test.go +++ b/exporter/alertmanagerexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index 23156566d9f9..e74aaacafc68 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -5,18 +5,18 @@ go 1.21 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index ecf7739d5419..b770aad5240a 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -62,8 +64,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= 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= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -167,8 +169,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/alibabacloudlogserviceexporter/README.md b/exporter/alibabacloudlogserviceexporter/README.md index 8db8cc37c2da..9709eda9e794 100644 --- a/exporter/alibabacloudlogserviceexporter/README.md +++ b/exporter/alibabacloudlogserviceexporter/README.md @@ -3,12 +3,12 @@ | Status | | | ------------- |-----------| -| Stability | [unmaintained]: traces, metrics, logs | +| Stability | [beta]: traces, metrics, logs | | Distributions | [contrib], [observiq] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Falibabacloudlogservice%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Falibabacloudlogservice) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Falibabacloudlogservice%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Falibabacloudlogservice) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@shabicheng](https://www.github.com/shabicheng), [@kongluoxing](https://www.github.com/kongluoxing), [@qiansheng91](https://www.github.com/qiansheng91) | -[unmaintained]: https://github.com/open-telemetry/opentelemetry-collector#unmaintained +[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib [observiq]: https://github.com/observIQ/observiq-otel-collector diff --git a/exporter/alibabacloudlogserviceexporter/generated_component_test.go b/exporter/alibabacloudlogserviceexporter/generated_component_test.go index e0e39450530a..3f21d51c8285 100644 --- a/exporter/alibabacloudlogserviceexporter/generated_component_test.go +++ b/exporter/alibabacloudlogserviceexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 5419554ef7fd..3a1e04abe6cc 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibab go 1.21 require ( - github.com/aliyun/aliyun-log-go-sdk v0.1.70 + github.com/aliyun/aliyun-log-go-sdk v0.1.71 github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -30,6 +30,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -45,12 +46,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,7 +62,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index c92b9c06566a..df47792e0979 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -39,8 +39,8 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.1 h1:K6kwgo+UiYx+/kr6CO0PN5ACZDzE3n github.com/alibabacloud-go/tea-utils/v2 v2.0.1/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= github.com/alibabacloud-go/tea-xml v1.1.2 h1:oLxa7JUXm2EDFzMg+7oRsYc+kutgCVwm+bZlhhmvW5M= github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/aliyun-log-go-sdk v0.1.70 h1:UUYesP5PL3kps6RuqpGwCbXylDWB54urJfXnp5qKJWM= -github.com/aliyun/aliyun-log-go-sdk v0.1.70/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= +github.com/aliyun/aliyun-log-go-sdk v0.1.71 h1:0zC74BgKUhmCDrrUArsjQD/igfNyAnc2vyuu9zLNRAc= +github.com/aliyun/aliyun-log-go-sdk v0.1.71/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= github.com/aliyun/credentials-go v1.1.2 h1:qU1vwGIBb3UJ8BwunHDRFtAhS6jnQLnde/yk0+Ih2GY= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -155,6 +155,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -353,30 +355,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -524,8 +526,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/alibabacloudlogserviceexporter/internal/metadata/generated_status.go b/exporter/alibabacloudlogserviceexporter/internal/metadata/generated_status.go index ea83a3144b88..8d609d8e3e36 100644 --- a/exporter/alibabacloudlogserviceexporter/internal/metadata/generated_status.go +++ b/exporter/alibabacloudlogserviceexporter/internal/metadata/generated_status.go @@ -13,9 +13,9 @@ var ( ) const ( - TracesStability = component.StabilityLevelUnmaintained - MetricsStability = component.StabilityLevelUnmaintained - LogsStability = component.StabilityLevelUnmaintained + TracesStability = component.StabilityLevelBeta + MetricsStability = component.StabilityLevelBeta + LogsStability = component.StabilityLevelBeta ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/exporter/alibabacloudlogserviceexporter/metadata.yaml b/exporter/alibabacloudlogserviceexporter/metadata.yaml index e75fef961cf3..d7fdaf3986d9 100644 --- a/exporter/alibabacloudlogserviceexporter/metadata.yaml +++ b/exporter/alibabacloudlogserviceexporter/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/alibabacloudlogservice status: class: exporter stability: - unmaintained: [traces, metrics, logs] + beta: [traces, metrics, logs] distributions: [contrib, observiq] codeowners: active: [shabicheng, kongluoxing, qiansheng91] diff --git a/exporter/awscloudwatchlogsexporter/generated_component_test.go b/exporter/awscloudwatchlogsexporter/generated_component_test.go index 6a0daa99272d..43a94327eafc 100644 --- a/exporter/awscloudwatchlogsexporter/generated_component_test.go +++ b/exporter/awscloudwatchlogsexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 0e55a0eafd10..ada9749ee347 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -45,19 +45,19 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index f3e965c8693c..c55e7255e2c2 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -74,26 +74,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +121,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -145,8 +145,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/awsemfexporter/generated_component_test.go b/exporter/awsemfexporter/generated_component_test.go index 38476727c15b..8613a09d57d9 100644 --- a/exporter/awsemfexporter/generated_component_test.go +++ b/exporter/awsemfexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index c55f95115c8d..9859d51e6482 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -51,20 +51,20 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 7e96bee9018b..f033efc0a96f 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -76,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +129,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -153,8 +153,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 5e0b0ce22264..790eb314ab86 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -11,16 +11,16 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.6.0 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -61,13 +61,13 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -76,7 +76,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 9915aaa31d73..99eb125be73c 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -58,8 +58,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -96,8 +96,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -108,28 +108,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -181,8 +181,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/awss3exporter/README.md b/exporter/awss3exporter/README.md index 2f29ba5eb4db..c6f13cc4fc93 100644 --- a/exporter/awss3exporter/README.md +++ b/exporter/awss3exporter/README.md @@ -22,18 +22,20 @@ This exporter targets to support proto/json format. The following exporter configuration parameters are supported. -| Name | Description | Default | -|:----------------------|:---------------------------------------------------------------------------------------------------------------------------------------------|-------------| -| `region` | AWS region. | "us-east-1" | -| `s3_bucket` | S3 bucket | | -| `s3_prefix` | prefix for the S3 key (root directory inside bucket). | | -| `s3_partition` | time granularity of S3 key: hour or minute | "minute" | -| `role_arn` | the Role ARN to be assumed | | -| `file_prefix` | file prefix defined by user | | -| `marshaler` | marshaler used to produce output data | `otlp_json` | -| `endpoint` | overrides the endpoint used by the exporter instead of constructing it from `region` and `s3_bucket` | | -| `s3_force_path_style` | [set this to `true` to force the request to use path-style addressing](http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html) | false | -| `disable_ssl` | set this to `true` to disable SSL when sending requests | false | +| Name | Description | Default | +|:----------------------|:-------------------------------------------------------------------------------------------------------------------------------------------|-------------| +| `region` | AWS region. | "us-east-1" | +| `s3_bucket` | S3 bucket | | +| `s3_prefix` | prefix for the S3 key (root directory inside bucket). | | +| `s3_partition` | time granularity of S3 key: hour or minute | "minute" | +| `role_arn` | the Role ARN to be assumed | | +| `file_prefix` | file prefix defined by user | | +| `marshaler` | marshaler used to produce output data | `otlp_json` | +| `encoding` | Encoding extension to use to marshal data. Overrides the `marshaler` configuration option if set. | | +| `endpoint` | overrides the endpoint used by the exporter instead of constructing it from `region` and `s3_bucket` | | +| `s3_force_path_style` | [set this to `true` to force the request to use path-style addressing](http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html) | false | +| `disable_ssl` | set this to `true` to disable SSL when sending requests | false | +| `compression` | should the file be compressed | none | ### Marshaler @@ -46,6 +48,16 @@ Marshaler determines the format of data sent to AWS S3. Currently, the following - `body`: export the log body as string. **This format is supported only for logs.** +### Encoding + +Encoding overrides marshaler if present and sets to use an encoding extension defined in the collector configuration. + +See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/encoding. + +### Compression +- `none` (default): No compression will be applied +- `gzip`: Files will be compressed with gzip. **This does not support `sumo_ic`marshaler.** + # Example Configuration Following example configuration defines to store output in 'eu-central' region and bucket named 'databucket'. diff --git a/exporter/awss3exporter/config.go b/exporter/awss3exporter/config.go index 8ecd4bf6b2d3..82397f67ab35 100644 --- a/exporter/awss3exporter/config.go +++ b/exporter/awss3exporter/config.go @@ -6,21 +6,24 @@ package awss3exporter // import "github.com/open-telemetry/opentelemetry-collect import ( "errors" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configcompression" "go.uber.org/multierr" ) // S3UploaderConfig contains aws s3 uploader related config to controls things // like bucket, prefix, batching, connections, retries, etc. type S3UploaderConfig struct { - Region string `mapstructure:"region"` - S3Bucket string `mapstructure:"s3_bucket"` - S3Prefix string `mapstructure:"s3_prefix"` - S3Partition string `mapstructure:"s3_partition"` - FilePrefix string `mapstructure:"file_prefix"` - Endpoint string `mapstructure:"endpoint"` - RoleArn string `mapstructure:"role_arn"` - S3ForcePathStyle bool `mapstructure:"s3_force_path_style"` - DisableSSL bool `mapstructure:"disable_ssl"` + Region string `mapstructure:"region"` + S3Bucket string `mapstructure:"s3_bucket"` + S3Prefix string `mapstructure:"s3_prefix"` + S3Partition string `mapstructure:"s3_partition"` + FilePrefix string `mapstructure:"file_prefix"` + Endpoint string `mapstructure:"endpoint"` + RoleArn string `mapstructure:"role_arn"` + S3ForcePathStyle bool `mapstructure:"s3_force_path_style"` + DisableSSL bool `mapstructure:"disable_ssl"` + Compression configcompression.Type `mapstructure:"compression"` } type MarshalerType string @@ -38,6 +41,8 @@ type Config struct { MarshalerName MarshalerType `mapstructure:"marshaler"` FileFormat string `mapstructure:"file_format"` + // Encoding to apply. If present, overrides the marshaler configuration option. + Encoding *component.ID `mapstructure:"encoding"` } func (c *Config) Validate() error { @@ -48,5 +53,15 @@ func (c *Config) Validate() error { if c.S3Uploader.S3Bucket == "" { errs = multierr.Append(errs, errors.New("bucket is required")) } + compression := c.S3Uploader.Compression + if compression.IsCompressed() { + if compression != configcompression.TypeGzip { + errs = multierr.Append(errs, errors.New("unknown compression type")) + } + + if c.MarshalerName == SumoIC { + errs = multierr.Append(errs, errors.New("marshaler does not support compression")) + } + } return errs } diff --git a/exporter/awss3exporter/config_test.go b/exporter/awss3exporter/config_test.go index 4ff16b56b9b7..dd253b5a9dc5 100644 --- a/exporter/awss3exporter/config_test.go +++ b/exporter/awss3exporter/config_test.go @@ -29,8 +29,10 @@ func TestLoadConfig(t *testing.T) { require.NotNil(t, cfg) e := cfg.Exporters[component.MustNewID("awss3")].(*Config) + encoding := component.MustNewIDWithName("foo", "bar") assert.Equal(t, e, &Config{ + Encoding: &encoding, S3Uploader: S3UploaderConfig{ Region: "us-east-1", S3Bucket: "foo", @@ -196,3 +198,45 @@ func TestMarshallerName(t *testing.T) { ) } + +func TestCompressionName(t *testing.T) { + factories, err := otelcoltest.NopFactories() + assert.NoError(t, err) + + factory := NewFactory() + factories.Exporters[factory.Type()] = factory + cfg, err := otelcoltest.LoadConfigAndValidate( + filepath.Join("testdata", "compression.yaml"), factories) + + require.NoError(t, err) + require.NotNil(t, cfg) + + e := cfg.Exporters[component.MustNewID("awss3")].(*Config) + + assert.Equal(t, e, + &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Partition: "minute", + Compression: "gzip", + }, + MarshalerName: "otlp_json", + }, + ) + + e = cfg.Exporters[component.MustNewIDWithName("awss3", "proto")].(*Config) + + assert.Equal(t, e, + &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "bar", + S3Partition: "minute", + Compression: "none", + }, + MarshalerName: "otlp_proto", + }, + ) + +} diff --git a/exporter/awss3exporter/exporter.go b/exporter/awss3exporter/exporter.go index 6f86d185e19a..0650886dfdd0 100644 --- a/exporter/awss3exporter/exporter.go +++ b/exporter/awss3exporter/exporter.go @@ -5,8 +5,9 @@ package awss3exporter // import "github.com/open-telemetry/opentelemetry-collect import ( "context" - "errors" + "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" @@ -23,26 +24,32 @@ type s3Exporter struct { } func newS3Exporter(config *Config, - params exporter.CreateSettings) (*s3Exporter, error) { - - if config == nil { - return nil, errors.New("s3 exporter config is nil") - } - - logger := params.Logger - - m, err := newMarshaler(config.MarshalerName, logger) - if err != nil { - return nil, errors.New("unknown marshaler") - } + params exporter.CreateSettings) *s3Exporter { s3Exporter := &s3Exporter{ config: config, dataWriter: &s3Writer{}, - logger: logger, - marshaler: m, + logger: params.Logger, } - return s3Exporter, nil + return s3Exporter +} + +func (e *s3Exporter) start(_ context.Context, host component.Host) error { + + var m marshaler + var err error + if e.config.Encoding != nil { + if m, err = newMarshalerFromEncoding(e.config.Encoding, host, e.logger); err != nil { + return err + } + } else { + if m, err = newMarshaler(e.config.MarshalerName, e.logger); err != nil { + return fmt.Errorf("unknown marshaler %q", e.config.MarshalerName) + } + } + + e.marshaler = m + return nil } func (e *s3Exporter) Capabilities() consumer.Capabilities { diff --git a/exporter/awss3exporter/factory.go b/exporter/awss3exporter/factory.go index 61c64807f483..12c1ead83d1a 100644 --- a/exporter/awss3exporter/factory.go +++ b/exporter/awss3exporter/factory.go @@ -39,24 +39,19 @@ func createLogsExporter(ctx context.Context, params exporter.CreateSettings, config component.Config) (exporter.Logs, error) { - s3Exporter, err := newS3Exporter(config.(*Config), params) - if err != nil { - return nil, err - } + s3Exporter := newS3Exporter(config.(*Config), params) return exporterhelper.NewLogsExporter(ctx, params, config, - s3Exporter.ConsumeLogs) + s3Exporter.ConsumeLogs, + exporterhelper.WithStart(s3Exporter.start)) } func createMetricsExporter(ctx context.Context, params exporter.CreateSettings, config component.Config) (exporter.Metrics, error) { - s3Exporter, err := newS3Exporter(config.(*Config), params) - if err != nil { - return nil, err - } + s3Exporter := newS3Exporter(config.(*Config), params) if config.(*Config).MarshalerName == SumoIC { return nil, fmt.Errorf("metrics are not supported by sumo_ic output format") @@ -64,17 +59,15 @@ func createMetricsExporter(ctx context.Context, return exporterhelper.NewMetricsExporter(ctx, params, config, - s3Exporter.ConsumeMetrics) + s3Exporter.ConsumeMetrics, + exporterhelper.WithStart(s3Exporter.start)) } func createTracesExporter(ctx context.Context, params exporter.CreateSettings, config component.Config) (exporter.Traces, error) { - s3Exporter, err := newS3Exporter(config.(*Config), params) - if err != nil { - return nil, err - } + s3Exporter := newS3Exporter(config.(*Config), params) if config.(*Config).MarshalerName == SumoIC { return nil, fmt.Errorf("traces are not supported by sumo_ic output format") @@ -83,5 +76,6 @@ func createTracesExporter(ctx context.Context, return exporterhelper.NewTracesExporter(ctx, params, config, - s3Exporter.ConsumeTraces) + s3Exporter.ConsumeTraces, + exporterhelper.WithStart(s3Exporter.start)) } diff --git a/exporter/awss3exporter/generated_component_test.go b/exporter/awss3exporter/generated_component_test.go index c9b8a9eff686..cd70588d72a3 100644 --- a/exporter/awss3exporter/generated_component_test.go +++ b/exporter/awss3exporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awss3exporter/go.mod b/exporter/awss3exporter/go.mod index 79096e087ec9..3d57a5230a61 100644 --- a/exporter/awss3exporter/go.mod +++ b/exporter/awss3exporter/go.mod @@ -5,12 +5,13 @@ go 1.21 require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -49,30 +50,30 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -95,7 +96,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/awss3exporter/go.sum b/exporter/awss3exporter/go.sum index c6cfb4fecfad..23c529721f45 100644 --- a/exporter/awss3exporter/go.sum +++ b/exporter/awss3exporter/go.sum @@ -113,8 +113,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -139,58 +139,60 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -269,7 +271,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -306,8 +308,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/awss3exporter/marshaler.go b/exporter/awss3exporter/marshaler.go index 37dcc3f54a17..6054c6977bf9 100644 --- a/exporter/awss3exporter/marshaler.go +++ b/exporter/awss3exporter/marshaler.go @@ -5,7 +5,9 @@ package awss3exporter // import "github.com/open-telemetry/opentelemetry-collect import ( "errors" + "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -23,6 +25,20 @@ var ( ErrUnknownMarshaler = errors.New("unknown marshaler") ) +func newMarshalerFromEncoding(encoding *component.ID, host component.Host, logger *zap.Logger) (marshaler, error) { + marshaler := &s3Marshaler{logger: logger} + e, ok := host.GetExtensions()[*encoding] + if !ok { + return nil, fmt.Errorf("unknown encoding %q", encoding) + } + // cast with ok to avoid panics. + marshaler.logsMarshaler, _ = e.(plog.Marshaler) + marshaler.metricsMarshaler, _ = e.(pmetric.Marshaler) + marshaler.tracesMarshaler, _ = e.(ptrace.Marshaler) + marshaler.fileFormat = encoding.String() + return marshaler, nil +} + func newMarshaler(mType MarshalerType, logger *zap.Logger) (marshaler, error) { marshaler := &s3Marshaler{logger: logger} switch mType { diff --git a/exporter/awss3exporter/marshaler_test.go b/exporter/awss3exporter/marshaler_test.go index 9357466b201d..09f1e8fb5982 100644 --- a/exporter/awss3exporter/marshaler_test.go +++ b/exporter/awss3exporter/marshaler_test.go @@ -4,10 +4,13 @@ package awss3exporter import ( + "context" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" ) @@ -42,3 +45,59 @@ func TestMarshaler(t *testing.T) { assert.Equal(t, m.format(), "txt") } } + +type hostWithExtensions struct { + encoding encodingExtension +} + +func (h hostWithExtensions) Start(context.Context, component.Host) error { + panic("unsupported") +} + +func (h hostWithExtensions) Shutdown(context.Context) error { + panic("unsupported") +} + +func (h hostWithExtensions) GetFactory(component.Kind, component.Type) component.Factory { + panic("unsupported") +} + +func (h hostWithExtensions) GetExtensions() map[component.ID]component.Component { + return map[component.ID]component.Component{ + component.MustNewID("foo"): h.encoding, + } +} + +func (h hostWithExtensions) GetExporters() map[component.DataType]map[component.ID]component.Component { + panic("unsupported") +} + +type encodingExtension struct { +} + +func (e encodingExtension) Start(_ context.Context, _ component.Host) error { + panic("unsupported") +} + +func (e encodingExtension) Shutdown(_ context.Context) error { + panic("unsupported") +} + +func TestMarshalerFromEncoding(t *testing.T) { + id := component.MustNewID("foo") + + { + host := hostWithExtensions{ + encoding: encodingExtension{}, + } + m, err := newMarshalerFromEncoding(&id, host, zap.NewNop()) + assert.NoError(t, err) + require.NotNil(t, m) + assert.Equal(t, "foo", m.format()) + } + { + m, err := newMarshalerFromEncoding(&id, componenttest.NewNopHost(), zap.NewNop()) + assert.EqualError(t, err, `unknown encoding "foo"`) + require.Nil(t, m) + } +} diff --git a/exporter/awss3exporter/s3_writer.go b/exporter/awss3exporter/s3_writer.go index c0cafeb13466..1518bb48ecf0 100644 --- a/exporter/awss3exporter/s3_writer.go +++ b/exporter/awss3exporter/s3_writer.go @@ -5,6 +5,7 @@ package awss3exporter // import "github.com/open-telemetry/opentelemetry-collect import ( "bytes" + "compress/gzip" "context" "fmt" "math/rand" @@ -15,6 +16,7 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials/stscreds" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3/s3manager" + "go.opentelemetry.io/collector/config/configcompression" ) type s3Writer struct { @@ -38,12 +40,17 @@ func randomInRange(low, hi int) int { return low + rand.Intn(hi-low) } -func getS3Key(time time.Time, keyPrefix string, partition string, filePrefix string, metadata string, fileformat string) string { +func getS3Key(time time.Time, keyPrefix string, partition string, filePrefix string, metadata string, fileformat string, compression configcompression.Type) string { timeKey := getTimeKey(time, partition) randomID := randomInRange(100000000, 999999999) s3Key := keyPrefix + "/" + timeKey + "/" + filePrefix + metadata + "_" + strconv.Itoa(randomID) + "." + fileformat + // add ".gz" extension to files if compression is enabled + if compression == configcompression.TypeGzip { + s3Key += ".gz" + } + return s3Key } @@ -77,10 +84,28 @@ func (s3writer *s3Writer) writeBuffer(_ context.Context, buf []byte, config *Con now := time.Now() key := getS3Key(now, config.S3Uploader.S3Prefix, config.S3Uploader.S3Partition, - config.S3Uploader.FilePrefix, metadata, format) - - // create a reader from data data in memory - reader := bytes.NewReader(buf) + config.S3Uploader.FilePrefix, metadata, format, config.S3Uploader.Compression) + + encoding := "" + var reader *bytes.Reader + if config.S3Uploader.Compression == configcompression.TypeGzip { + // set s3 uploader content encoding to "gzip" + encoding = "gzip" + var gzipContents bytes.Buffer + + // create a gzip from data + gzipWriter := gzip.NewWriter(&gzipContents) + _, err := gzipWriter.Write(buf) + if err != nil { + return err + } + gzipWriter.Close() + + reader = bytes.NewReader(gzipContents.Bytes()) + } else { + // create a reader from data in memory + reader = bytes.NewReader(buf) + } sessionConfig := getSessionConfig(config) sess, err := getSession(config, sessionConfig) @@ -92,9 +117,10 @@ func (s3writer *s3Writer) writeBuffer(_ context.Context, buf []byte, config *Con uploader := s3manager.NewUploader(sess) _, err = uploader.Upload(&s3manager.UploadInput{ - Bucket: aws.String(config.S3Uploader.S3Bucket), - Key: aws.String(key), - Body: reader, + Bucket: aws.String(config.S3Uploader.S3Bucket), + Key: aws.String(key), + Body: reader, + ContentEncoding: &encoding, }) if err != nil { return err diff --git a/exporter/awss3exporter/s3_writer_test.go b/exporter/awss3exporter/s3_writer_test.go index 8b5e4eedcb5d..1da692ba92fa 100644 --- a/exporter/awss3exporter/s3_writer_test.go +++ b/exporter/awss3exporter/s3_writer_test.go @@ -36,7 +36,21 @@ func TestS3Key(t *testing.T) { require.NotNil(t, tm) re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+).json`) - s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "json") + s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "json", "") + matched := re.MatchString(s3Key) + assert.Equal(t, true, matched) +} + +func TestS3KeyOfCompressedFile(t *testing.T) { + const layout = "2006-01-02" + + tm, err := time.Parse(layout, "2022-06-05") + + assert.NoError(t, err) + require.NotNil(t, tm) + + re := regexp.MustCompile(`keyprefix/year=2022/month=06/day=05/hour=00/minute=00/fileprefixlogs_([0-9]+).json.gz`) + s3Key := getS3Key(tm, "keyprefix", "minute", "fileprefix", "logs", "json", "gzip") matched := re.MatchString(s3Key) assert.Equal(t, true, matched) } diff --git a/exporter/awss3exporter/testdata/compression.yaml b/exporter/awss3exporter/testdata/compression.yaml new file mode 100644 index 000000000000..68966317b961 --- /dev/null +++ b/exporter/awss3exporter/testdata/compression.yaml @@ -0,0 +1,26 @@ +receivers: + nop: + +exporters: + awss3: + s3uploader: + s3_bucket: "foo" + compression: "gzip" + marshaler: otlp_json + + awss3/proto: + s3uploader: + s3_bucket: "bar" + compression: "none" + marshaler: otlp_proto + + +processors: + nop: + +service: + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [awss3, awss3/proto] diff --git a/exporter/awss3exporter/testdata/default.yaml b/exporter/awss3exporter/testdata/default.yaml index 09513cb0fae0..ddbf71439572 100644 --- a/exporter/awss3exporter/testdata/default.yaml +++ b/exporter/awss3exporter/testdata/default.yaml @@ -3,6 +3,7 @@ receivers: exporters: awss3: + encoding: "foo/bar" s3uploader: s3_bucket: "foo" region: 'us-east-1' diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index 56db7041c9fe..e4ff6828f794 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -69,17 +69,19 @@ func TestTelemetryEnabled(t *testing.T) { registry := telemetry.NewRegistry() sink := telemetrytest.NewSenderSink() // preload the sender that the exporter will use - sender, loaded := registry.LoadOrStore(exportertest.NewNopCreateSettings().ID, sink) + set := exportertest.NewNopCreateSettings() + sender, loaded := registry.LoadOrStore(set.ID, sink) require.False(t, loaded) require.NotNil(t, sender) require.Equal(t, sink, sender) cfg := generateConfig(t) cfg.TelemetryConfig.Enabled = true - traceExporter := initializeTracesExporter(t, cfg, registry) + traceExporter, err := newTracesExporter(cfg, set, new(awsutil.Conn), registry) + assert.NoError(t, err) ctx := context.Background() assert.NoError(t, traceExporter.Start(ctx, componenttest.NewNopHost())) td := constructSpanData() - err := traceExporter.ConsumeTraces(ctx, td) + err = traceExporter.ConsumeTraces(ctx, td) assert.Error(t, err) err = traceExporter.Shutdown(ctx) assert.NoError(t, err) diff --git a/exporter/awsxrayexporter/generated_component_test.go b/exporter/awsxrayexporter/generated_component_test.go index 692caacf546c..de2a712670ad 100644 --- a/exporter/awsxrayexporter/generated_component_test.go +++ b/exporter/awsxrayexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 9a72481285b8..bbfe1d6ffd41 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -46,21 +47,21 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index c949a1985b9f..36fa50ae5f7c 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -74,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -125,8 +127,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -149,8 +151,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 8706bc923781..b3b8a91a3f61 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -80,7 +80,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index 47cb8623cec3..c1023e09f011 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -135,28 +135,28 @@ github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pv 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -238,8 +238,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/azuremonitorexporter/generated_component_test.go b/exporter/azuremonitorexporter/generated_component_test.go index 9e9048a6f007..d2d202bfd315 100644 --- a/exporter/azuremonitorexporter/generated_component_test.go +++ b/exporter/azuremonitorexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 459450f90f60..7369c4f7eea0 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,17 +6,17 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.21.0 + golang.org/x/net v0.22.0 ) require ( @@ -31,6 +31,7 @@ require ( github.com/gofrs/uuid v4.0.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -45,11 +46,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -58,7 +59,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index fdc1027efbe6..410360896a59 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -83,30 +85,30 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -135,8 +137,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/carbonexporter/generated_component_test.go b/exporter/carbonexporter/generated_component_test.go index b4234639f099..7a02d6c0c47e 100644 --- a/exporter/carbonexporter/generated_component_test.go +++ b/exporter/carbonexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 20181639157e..45b0650b99cc 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -43,12 +44,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -58,7 +59,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 8e5c4d990998..4dad9f839ba4 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -66,32 +68,32 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -143,8 +145,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod index 056bd9164cd1..88bbd327aeac 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,12 +43,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum index fc2eb453b292..b71893fd2393 100644 --- a/exporter/cassandraexporter/go.sum +++ b/exporter/cassandraexporter/go.sum @@ -32,6 +32,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -78,28 +80,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -151,8 +153,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/clickhouseexporter/README.md b/exporter/clickhouseexporter/README.md index 207f3c1640cb..2293a57b4948 100644 --- a/exporter/clickhouseexporter/README.md +++ b/exporter/clickhouseexporter/README.md @@ -342,3 +342,7 @@ service: processors: [ batch ] exporters: [ clickhouse ] ``` + +## Developer tips + +- Make sure integration tests pass after any change of sql \ No newline at end of file diff --git a/exporter/clickhouseexporter/exporter_logs_test.go b/exporter/clickhouseexporter/exporter_logs_test.go index fc04402702f9..417cda22ec7c 100644 --- a/exporter/clickhouseexporter/exporter_logs_test.go +++ b/exporter/clickhouseexporter/exporter_logs_test.go @@ -121,6 +121,7 @@ func TestExporter_pushLogsData(t *testing.T) { }) } +// nolint:unparam // not need to check this func func newTestLogsExporter(t *testing.T, dsn string, fns ...func(*Config)) *logsExporter { exporter, err := newLogsExporter(zaptest.NewLogger(t), withTestExporterConfig(fns...)(dsn)) require.NoError(t, err) @@ -151,10 +152,18 @@ func simpleLogs(count int) plog.Logs { sl.Scope().SetName("io.opentelemetry.contrib.clickhouse") sl.Scope().SetVersion("1.0.0") sl.Scope().Attributes().PutStr("lib", "clickhouse") + timestamp := time.Unix(1703498029, 0) for i := 0; i < count; i++ { r := sl.LogRecords().AppendEmpty() - r.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) - r.Attributes().PutStr(conventions.AttributeServiceName, "v") + r.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) + r.SetObservedTimestamp(pcommon.NewTimestampFromTime(timestamp)) + r.SetSeverityNumber(plog.SeverityNumberError2) + r.SetSeverityText("error") + r.Body().SetStr("error message") + r.Attributes().PutStr(conventions.AttributeServiceNamespace, "default") + r.SetFlags(plog.DefaultLogRecordFlags) + r.SetTraceID([16]byte{1, 2, 3, byte(i)}) + r.SetSpanID([8]byte{1, 2, 3, byte(i)}) } return logs } diff --git a/exporter/clickhouseexporter/exporter_metrics_test.go b/exporter/clickhouseexporter/exporter_metrics_test.go index 4d407131e257..ee9ad9bb6fd7 100644 --- a/exporter/clickhouseexporter/exporter_metrics_test.go +++ b/exporter/clickhouseexporter/exporter_metrics_test.go @@ -29,7 +29,7 @@ func TestExporter_pushMetricsData(t *testing.T) { } return nil }) - exporter := newTestMetricsExporter(t) + exporter := newTestMetricsExporter(t, defaultEndpoint) mustPushMetricsData(t, exporter, simpleMetrics(1)) require.Equal(t, int32(15), items.Load()) @@ -41,7 +41,7 @@ func TestExporter_pushMetricsData(t *testing.T) { } return nil }) - exporter := newTestMetricsExporter(t) + exporter := newTestMetricsExporter(t, defaultEndpoint) err := exporter.pushMetricsData(context.TODO(), simpleMetrics(2)) require.Error(t, err) }) @@ -93,7 +93,7 @@ func TestExporter_pushMetricsData(t *testing.T) { } return nil }) - exporter := newTestMetricsExporter(t) + exporter := newTestMetricsExporter(t, defaultEndpoint) mustPushMetricsData(t, exporter, simpleMetrics(1)) require.Equal(t, int32(15), items.Load()) @@ -118,14 +118,14 @@ func TestExporter_pushMetricsData(t *testing.T) { } return nil }) - exporter := newTestMetricsExporter(t) + exporter := newTestMetricsExporter(t, defaultEndpoint) mustPushMetricsData(t, exporter, simpleMetrics(1)) }) } func Benchmark_pushMetricsData(b *testing.B) { pm := simpleMetrics(1) - exporter := newTestMetricsExporter(&testing.T{}) + exporter := newTestMetricsExporter(&testing.T{}, defaultEndpoint) b.ReportAllocs() b.ResetTimer() for n := 0; n < b.N; n++ { @@ -148,6 +148,7 @@ func simpleMetrics(count int) pmetric.Metrics { sm.Scope().SetDroppedAttributesCount(10) sm.Scope().SetName("Scope name 1") sm.Scope().SetVersion("Scope version 1") + timestamp := time.Unix(1703498029, 0) for i := 0; i < count; i++ { // gauge m := sm.Metrics().AppendEmpty() @@ -156,10 +157,12 @@ func simpleMetrics(count int) pmetric.Metrics { m.SetDescription("This is a gauge metrics") dp := m.SetEmptyGauge().DataPoints().AppendEmpty() dp.SetIntValue(int64(i)) + dp.SetFlags(pmetric.DefaultDataPointFlags) dp.Attributes().PutStr("gauge_label_1", "1") - dp.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + dp.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + dp.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars := dp.Exemplars().AppendEmpty() + exemplars.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars.SetIntValue(54) exemplars.FilteredAttributes().PutStr("key", "value") exemplars.FilteredAttributes().PutStr("key2", "value2") @@ -173,10 +176,12 @@ func simpleMetrics(count int) pmetric.Metrics { m.SetDescription("This is a sum metrics") dp = m.SetEmptySum().DataPoints().AppendEmpty() dp.SetDoubleValue(11.234) + dp.SetFlags(pmetric.DefaultDataPointFlags) dp.Attributes().PutStr("sum_label_1", "1") - dp.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + dp.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + dp.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars = dp.Exemplars().AppendEmpty() + exemplars.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars.SetIntValue(54) exemplars.FilteredAttributes().PutStr("key", "value") exemplars.FilteredAttributes().PutStr("key2", "value2") @@ -189,17 +194,18 @@ func simpleMetrics(count int) pmetric.Metrics { m.SetUnit("ms") m.SetDescription("This is a histogram metrics") dpHisto := m.SetEmptyHistogram().DataPoints().AppendEmpty() - dpHisto.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - dpHisto.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + dpHisto.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + dpHisto.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) dpHisto.SetCount(1) dpHisto.SetSum(1) dpHisto.Attributes().PutStr("key", "value") - dpHisto.Attributes().PutStr("key", "value") + dpHisto.Attributes().PutStr("key2", "value") dpHisto.ExplicitBounds().FromRaw([]float64{0, 0, 0, 0, 0}) dpHisto.BucketCounts().FromRaw([]uint64{0, 0, 0, 1, 0}) dpHisto.SetMin(0) dpHisto.SetMax(1) exemplars = dpHisto.Exemplars().AppendEmpty() + exemplars.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars.SetDoubleValue(55.22) exemplars.FilteredAttributes().PutStr("key", "value") exemplars.FilteredAttributes().PutStr("key2", "value2") @@ -212,21 +218,22 @@ func simpleMetrics(count int) pmetric.Metrics { m.SetUnit("ms") m.SetDescription("This is a exp histogram metrics") dpExpHisto := m.SetEmptyExponentialHistogram().DataPoints().AppendEmpty() - dpExpHisto.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - dpExpHisto.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + dpExpHisto.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + dpExpHisto.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) dpExpHisto.SetSum(1) dpExpHisto.SetMin(0) dpExpHisto.SetMax(1) dpExpHisto.SetZeroCount(0) dpExpHisto.SetCount(1) dpExpHisto.Attributes().PutStr("key", "value") - dpExpHisto.Attributes().PutStr("key", "value") + dpExpHisto.Attributes().PutStr("key2", "value") dpExpHisto.Negative().SetOffset(1) dpExpHisto.Negative().BucketCounts().FromRaw([]uint64{0, 0, 0, 1, 0}) dpExpHisto.Positive().SetOffset(1) dpExpHisto.Positive().BucketCounts().FromRaw([]uint64{0, 0, 0, 1, 0}) exemplars = dpExpHisto.Exemplars().AppendEmpty() + exemplars.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) exemplars.SetIntValue(54) exemplars.FilteredAttributes().PutStr("key", "value") exemplars.FilteredAttributes().PutStr("key2", "value2") @@ -239,10 +246,10 @@ func simpleMetrics(count int) pmetric.Metrics { m.SetUnit("ms") m.SetDescription("This is a summary metrics") summary := m.SetEmptySummary().DataPoints().AppendEmpty() - summary.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - summary.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + summary.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + summary.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) summary.Attributes().PutStr("key", "value") - summary.Attributes().PutStr("key2", "value2") + summary.Attributes().PutStr("key2", "value") summary.SetCount(1) summary.SetSum(1) quantileValues := summary.QuantileValues().AppendEmpty() @@ -475,8 +482,9 @@ func mustPushMetricsData(t *testing.T, exporter *metricsExporter, md pmetric.Met require.NoError(t, err) } -func newTestMetricsExporter(t *testing.T) *metricsExporter { - exporter, err := newMetricsExporter(zaptest.NewLogger(t), withTestExporterConfig()(defaultEndpoint)) +// nolint:unparam // not need to check this func +func newTestMetricsExporter(t *testing.T, dsn string, fns ...func(*Config)) *metricsExporter { + exporter, err := newMetricsExporter(zaptest.NewLogger(t), withTestExporterConfig(fns...)(dsn)) require.NoError(t, err) require.NoError(t, exporter.start(context.TODO(), nil)) diff --git a/exporter/clickhouseexporter/exporter_traces_test.go b/exporter/clickhouseexporter/exporter_traces_test.go index 2bff1fcdc2b2..d8d6bdf268a2 100644 --- a/exporter/clickhouseexporter/exporter_traces_test.go +++ b/exporter/clickhouseexporter/exporter_traces_test.go @@ -69,15 +69,28 @@ func simpleTraces(count int) ptrace.Traces { ss.SetSchemaUrl("https://opentelemetry.io/schemas/1.7.0") ss.Scope().SetDroppedAttributesCount(20) ss.Scope().Attributes().PutStr("lib", "clickhouse") + timestamp := time.Unix(1703498029, 0) for i := 0; i < count; i++ { s := ss.Spans().AppendEmpty() - s.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - s.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + s.SetTraceID([16]byte{1, 2, 3, byte(i)}) + s.SetSpanID([8]byte{1, 2, 3, byte(i)}) + s.TraceState().FromRaw("trace state") + s.SetParentSpanID([8]byte{1, 2, 4, byte(i)}) + s.SetName("call db") + s.SetKind(ptrace.SpanKindInternal) + s.SetStartTimestamp(pcommon.NewTimestampFromTime(timestamp)) + s.SetEndTimestamp(pcommon.NewTimestampFromTime(timestamp.Add(time.Minute))) s.Attributes().PutStr(conventions.AttributeServiceName, "v") + s.Status().SetMessage("error") + s.Status().SetCode(ptrace.StatusCodeError) event := s.Events().AppendEmpty() event.SetName("event1") - event.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + event.SetTimestamp(pcommon.NewTimestampFromTime(timestamp)) + event.Attributes().PutStr("level", "info") link := s.Links().AppendEmpty() + link.SetTraceID([16]byte{1, 2, 5, byte(i)}) + link.SetSpanID([8]byte{1, 2, 5, byte(i)}) + link.TraceState().FromRaw("error") link.Attributes().PutStr("k", "v") } return traces diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index f409f6a267dd..3eeea256f9f6 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,17 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.21 require ( - github.com/ClickHouse/clickhouse-go/v2 v2.17.1 + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 github.com/cenkalti/backoff/v4 v4.2.1 + github.com/jmoiron/sqlx v1.3.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + github.com/testcontainers/testcontainers-go v0.28.0 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -21,53 +23,86 @@ require ( ) require ( - github.com/ClickHouse/ch-go v0.58.2 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + dario.cat/mergo v1.0.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/hcsshim v0.11.4 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/containerd/containerd v1.7.12 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/docker v25.0.3+incompatible // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-faster/city v1.0.1 // indirect - github.com/go-faster/errors v0.6.1 // indirect + github.com/go-faster/errors v0.7.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/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/patternmatcher v0.6.0 // indirect + github.com/moby/sys/sequential v0.5.0 // indirect + github.com/moby/sys/user v0.1.0 // indirect + github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/paulmach/orb v0.10.0 // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0-rc5 // indirect + github.com/paulmach/orb v0.11.1 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/segmentio/asm v1.2.0 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 83de211cec5c..4b503b1a7792 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -1,27 +1,59 @@ -github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= -github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1 h1:ZCmAYWpu75IyEi7+Yrs/uaAjiCGY5wfW5kXo64exkX4= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= +github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= +github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= 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/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E= +github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= 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/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= +github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= -github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI= -github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= 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/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -32,18 +64,24 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.2/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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= 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.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -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/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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= @@ -57,25 +95,49 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +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/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= +github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= +github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= +github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= 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/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s= -github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= +github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= -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/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= @@ -88,47 +150,75 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +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/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= 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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8= +github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +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/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 h1:Xw8U6u2f8DK2XAkGRFV7BBLENgnTGX9i4rQRxJf+/vs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0/go.mod h1:6KW1Fm6R/s6Z3PGXwSJN2K4eT6wQB3vXX6CVnYX9NmM= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= go.opentelemetry.io/otel/exporters/prometheus v0.46.0/go.mod h1:ztwVUHe5DTR/1v7PeuGRnU5Bbd4QKYwApWmuutKsJSs= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -139,6 +229,8 @@ go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9os go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= +go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= 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,25 +241,38 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +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.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -177,18 +282,25 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= 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 v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -201,3 +313,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV 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= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= +gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/exporter/clickhouseexporter/integration_test.go b/exporter/clickhouseexporter/integration_test.go new file mode 100644 index 000000000000..968b46247545 --- /dev/null +++ b/exporter/clickhouseexporter/integration_test.go @@ -0,0 +1,593 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:build integration +// +build integration + +package clickhouseexporter + +import ( + "context" + "fmt" + "math/rand" + "strconv" + "testing" + "time" + + "github.com/jmoiron/sqlx" + "github.com/stretchr/testify/require" + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" + "go.opentelemetry.io/collector/pdata/pmetric" +) + +func TestIntegration(t *testing.T) { + testCase := []struct { + name string + image string + }{ + { + name: "test clickhouse 23-alpine", + image: "clickhouse/clickhouse-server:23-alpine", + }, + { + name: "test clickhouse 22-alpine", + image: "clickhouse/clickhouse-server:22-alpine", + }, + } + + for _, c := range testCase { + t.Run(c.name, func(t *testing.T) { + port := randPort() + req := testcontainers.ContainerRequest{ + Image: c.image, + ExposedPorts: []string{fmt.Sprintf("%s:9000", port)}, + WaitingFor: wait.ForListeningPort("9000"). + WithStartupTimeout(2 * time.Minute), + } + c := getContainer(t, req) + defer func() { + err := c.Terminate(context.Background()) + require.NoError(t, err) + }() + + host, err := c.Host(context.Background()) + require.NoError(t, err) + endpoint := fmt.Sprintf("tcp://%s:%s", host, port) + + logExporter := newTestLogsExporter(t, endpoint) + verifyExportLog(t, logExporter) + + traceExporter := newTestTracesExporter(t, endpoint) + require.NoError(t, err) + verifyExporterTrace(t, traceExporter) + + metricExporter := newTestMetricsExporter(t, endpoint) + require.NoError(t, err) + verifyExporterMetric(t, metricExporter) + }) + } +} + +func getContainer(t *testing.T, req testcontainers.ContainerRequest) testcontainers.Container { + require.NoError(t, req.Validate()) + container, err := testcontainers.GenericContainer( + context.Background(), + testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) + require.NoError(t, err) + + err = container.Start(context.Background()) + require.NoError(t, err) + return container +} + +func verifyExportLog(t *testing.T, logExporter *logsExporter) { + mustPushLogsData(t, logExporter, simpleLogs(1)) + db := sqlx.NewDb(logExporter.client, driverName) + + type log struct { + Timestamp string `db:"Timestamp"` + TraceID string `db:"TraceId"` + SpanID string `db:"SpanId"` + TraceFlags uint32 `db:"TraceFlags"` + SeverityText string `db:"SeverityText"` + SeverityNumber int32 `db:"SeverityNumber"` + ServiceName string `db:"ServiceName"` + Body string `db:"Body"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + LogAttributes map[string]string `db:"LogAttributes"` + } + + var actualLog log + + expectLog := log{ + Timestamp: "2023-12-25T09:53:49Z", + TraceID: "01020300000000000000000000000000", + SpanID: "0102030000000000", + SeverityText: "error", + SeverityNumber: 18, + ServiceName: "test-service", + Body: "error message", + ResourceSchemaURL: "https://opentelemetry.io/schemas/1.4.0", + ResourceAttributes: map[string]string{ + "service.name": "test-service", + }, + ScopeSchemaURL: "https://opentelemetry.io/schemas/1.7.0", + ScopeName: "io.opentelemetry.contrib.clickhouse", + ScopeVersion: "1.0.0", + ScopeAttributes: map[string]string{ + "lib": "clickhouse", + }, + LogAttributes: map[string]string{ + "service.namespace": "default", + }, + } + + err := db.Get(&actualLog, "select * from default.otel_logs") + require.NoError(t, err) + require.Equal(t, expectLog, actualLog) +} + +func verifyExporterTrace(t *testing.T, traceExporter *tracesExporter) { + mustPushTracesData(t, traceExporter, simpleTraces(1)) + db := sqlx.NewDb(traceExporter.client, driverName) + + type trace struct { + Timestamp string `db:"Timestamp"` + TraceID string `db:"TraceId"` + SpanID string `db:"SpanId"` + ParentSpanID string `db:"ParentSpanId"` + TraceState string `db:"TraceState"` + SpanName string `db:"SpanName"` + SpanKind string `db:"SpanKind"` + ServiceName string `db:"ServiceName"` + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + SpanAttributes map[string]string `db:"SpanAttributes"` + Duration int64 `db:"Duration"` + StatusCode string `db:"StatusCode"` + StatusMessage string `db:"StatusMessage"` + EventsTimestamp []time.Time `db:"Events.Timestamp"` + EventsName []string `db:"Events.Name"` + EventsAttributes []map[string]string `db:"Events.Attributes"` + LinksTraceID []string `db:"Links.TraceId"` + LinksSpanID []string `db:"Links.SpanId"` + LinksTraceState []string `db:"Links.TraceState"` + LinksAttributes []map[string]string `db:"Links.Attributes"` + } + + var actualTrace trace + + expectTrace := trace{ + Timestamp: "2023-12-25T09:53:49Z", + TraceID: "01020300000000000000000000000000", + SpanID: "0102030000000000", + ParentSpanID: "0102040000000000", + TraceState: "trace state", + SpanName: "call db", + SpanKind: "SPAN_KIND_INTERNAL", + ServiceName: "test-service", + ResourceAttributes: map[string]string{ + "service.name": "test-service", + }, + ScopeName: "io.opentelemetry.contrib.clickhouse", + ScopeVersion: "1.0.0", + SpanAttributes: map[string]string{ + "service.name": "v", + }, + Duration: 60000000000, + StatusCode: "STATUS_CODE_ERROR", + StatusMessage: "error", + EventsTimestamp: []time.Time{ + time.Unix(1703498029, 0).UTC(), + }, + EventsName: []string{"event1"}, + EventsAttributes: []map[string]string{ + { + "level": "info", + }, + }, + LinksTraceID: []string{ + "01020500000000000000000000000000", + }, + LinksSpanID: []string{ + "0102050000000000", + }, + LinksTraceState: []string{ + "error", + }, + LinksAttributes: []map[string]string{ + { + "k": "v", + }, + }, + } + + err := db.Get(&actualTrace, "select * from default.otel_traces") + require.NoError(t, err) + require.Equal(t, expectTrace, actualTrace) +} + +func verifyExporterMetric(t *testing.T, metricExporter *metricsExporter) { + metric := pmetric.NewMetrics() + rm := metric.ResourceMetrics().AppendEmpty() + simpleMetrics(1).ResourceMetrics().At(0).CopyTo(rm) + + mustPushMetricsData(t, metricExporter, metric) + db := sqlx.NewDb(metricExporter.client, driverName) + + verifyGaugeMetric(t, db) + verifySumMetric(t, db) + verifyHistogramMetric(t, db) + verifyExphistogramMetric(t, db) + verifySummaryMetric(t, db) +} + +func verifyGaugeMetric(t *testing.T, db *sqlx.DB) { + type gauge struct { + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + ScopeDroppedAttrCount uint32 `db:"ScopeDroppedAttrCount"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + MetricName string `db:"MetricName"` + MetricDescription string `db:"MetricDescription"` + MetricUnit string `db:"MetricUnit"` + Attributes map[string]string `db:"Attributes"` + StartTimeUnix string `db:"StartTimeUnix"` + TimeUnix string `db:"TimeUnix"` + Value float64 `db:"Value"` + Flags uint32 `db:"Flags"` + ExemplarsFilteredAttributes []map[string]string `db:"Exemplars.FilteredAttributes"` + ExemplarsTimeUnix []time.Time `db:"Exemplars.TimeUnix"` + ExemplarsValue []float64 `db:"Exemplars.Value"` + ExemplarsSpanID []string `db:"Exemplars.SpanId"` + ExemplarsTraceID []string `db:"Exemplars.TraceId"` + } + + var actualGauge gauge + + expectGauge := gauge{ + ResourceAttributes: map[string]string{ + "service.name": "demo 1", + "Resource Attributes 1": "value1", + }, + ResourceSchemaURL: "Resource SchemaUrl 1", + ScopeName: "Scope name 1", + ScopeVersion: "Scope version 1", + ScopeDroppedAttrCount: 10, + ScopeSchemaURL: "Scope SchemaUrl 1", + ScopeAttributes: map[string]string{ + "Scope Attributes 1": "value1", + }, + MetricName: "gauge metrics", + MetricDescription: "This is a gauge metrics", + MetricUnit: "count", + Attributes: map[string]string{ + "gauge_label_1": "1", + }, + StartTimeUnix: "2023-12-25T09:53:49Z", + TimeUnix: "2023-12-25T09:53:49Z", + Value: 0, + Flags: 0, + ExemplarsFilteredAttributes: []map[string]string{ + { + "key": "value", + "key2": "value2", + }, + }, + ExemplarsTimeUnix: []time.Time{time.Unix(1703498029, 0).UTC()}, + ExemplarsTraceID: []string{"01020300000000000000000000000000"}, + ExemplarsSpanID: []string{"0102030000000000"}, + ExemplarsValue: []float64{54}, + } + + err := db.Get(&actualGauge, "select * from default.otel_metrics_gauge") + require.NoError(t, err) + require.Equal(t, expectGauge, actualGauge) +} + +func verifySumMetric(t *testing.T, db *sqlx.DB) { + type sum struct { + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + ScopeDroppedAttrCount uint32 `db:"ScopeDroppedAttrCount"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + MetricName string `db:"MetricName"` + MetricDescription string `db:"MetricDescription"` + MetricUnit string `db:"MetricUnit"` + Attributes map[string]string `db:"Attributes"` + StartTimeUnix string `db:"StartTimeUnix"` + TimeUnix string `db:"TimeUnix"` + Value float64 `db:"Value"` + Flags uint32 `db:"Flags"` + ExemplarsFilteredAttributes []map[string]string `db:"Exemplars.FilteredAttributes"` + ExemplarsTimeUnix []time.Time `db:"Exemplars.TimeUnix"` + ExemplarsValue []float64 `db:"Exemplars.Value"` + ExemplarsSpanID []string `db:"Exemplars.SpanId"` + ExemplarsTraceID []string `db:"Exemplars.TraceId"` + AggTemp int32 `db:"AggTemp"` + IsMonotonic bool `db:"IsMonotonic"` + } + + var actualSum sum + + expectSum := sum{ + ResourceAttributes: map[string]string{ + "service.name": "demo 1", + "Resource Attributes 1": "value1", + }, + ResourceSchemaURL: "Resource SchemaUrl 1", + ScopeName: "Scope name 1", + ScopeVersion: "Scope version 1", + ScopeDroppedAttrCount: 10, + ScopeSchemaURL: "Scope SchemaUrl 1", + ScopeAttributes: map[string]string{ + "Scope Attributes 1": "value1", + }, + MetricName: "sum metrics", + MetricDescription: "This is a sum metrics", + MetricUnit: "count", + Attributes: map[string]string{ + "sum_label_1": "1", + }, + StartTimeUnix: "2023-12-25T09:53:49Z", + TimeUnix: "2023-12-25T09:53:49Z", + Value: 11.234, + Flags: 0, + ExemplarsFilteredAttributes: []map[string]string{ + { + "key": "value", + "key2": "value2", + }, + }, + ExemplarsTimeUnix: []time.Time{time.Unix(1703498029, 0).UTC()}, + ExemplarsTraceID: []string{"01020300000000000000000000000000"}, + ExemplarsSpanID: []string{"0102030000000000"}, + ExemplarsValue: []float64{54}, + } + + err := db.Get(&actualSum, "select * from default.otel_metrics_sum") + require.NoError(t, err) + require.Equal(t, expectSum, actualSum) +} + +func verifyHistogramMetric(t *testing.T, db *sqlx.DB) { + type sum struct { + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + ScopeDroppedAttrCount uint32 `db:"ScopeDroppedAttrCount"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + MetricName string `db:"MetricName"` + MetricDescription string `db:"MetricDescription"` + MetricUnit string `db:"MetricUnit"` + Attributes map[string]string `db:"Attributes"` + StartTimeUnix string `db:"StartTimeUnix"` + TimeUnix string `db:"TimeUnix"` + Count float64 `db:"Count"` + Sum float64 `db:"Sum"` + BucketCounts []uint64 `db:"BucketCounts"` + ExplicitBounds []float64 `db:"ExplicitBounds"` + ExemplarsFilteredAttributes []map[string]string `db:"Exemplars.FilteredAttributes"` + ExemplarsTimeUnix []time.Time `db:"Exemplars.TimeUnix"` + ExemplarsValue []float64 `db:"Exemplars.Value"` + ExemplarsSpanID []string `db:"Exemplars.SpanId"` + ExemplarsTraceID []string `db:"Exemplars.TraceId"` + Flags uint32 `db:"Flags"` + Min float64 `db:"Min"` + Max float64 `db:"Max"` + } + + var actualSum sum + + expectSum := sum{ + ResourceAttributes: map[string]string{ + "service.name": "demo 1", + "Resource Attributes 1": "value1", + }, + ResourceSchemaURL: "Resource SchemaUrl 1", + ScopeName: "Scope name 1", + ScopeVersion: "Scope version 1", + ScopeDroppedAttrCount: 10, + ScopeSchemaURL: "Scope SchemaUrl 1", + ScopeAttributes: map[string]string{ + "Scope Attributes 1": "value1", + }, + MetricName: "histogram metrics", + MetricDescription: "This is a histogram metrics", + MetricUnit: "ms", + Attributes: map[string]string{ + "key": "value", + "key2": "value", + }, + StartTimeUnix: "2023-12-25T09:53:49Z", + TimeUnix: "2023-12-25T09:53:49Z", + Count: 1, + Sum: 1, + BucketCounts: []uint64{0, 0, 0, 1, 0}, + ExplicitBounds: []float64{0, 0, 0, 0, 0}, + Flags: 0, + Min: 0, + Max: 1, + ExemplarsFilteredAttributes: []map[string]string{ + { + "key": "value", + "key2": "value2", + }, + }, + ExemplarsTimeUnix: []time.Time{time.Unix(1703498029, 0).UTC()}, + ExemplarsTraceID: []string{"01020300000000000000000000000000"}, + ExemplarsSpanID: []string{"0102030000000000"}, + ExemplarsValue: []float64{55.22}, + } + + err := db.Get(&actualSum, "select * from default.otel_metrics_histogram") + require.NoError(t, err) + require.Equal(t, expectSum, actualSum) +} + +func verifyExphistogramMetric(t *testing.T, db *sqlx.DB) { + type sum struct { + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + ScopeDroppedAttrCount uint32 `db:"ScopeDroppedAttrCount"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + MetricName string `db:"MetricName"` + MetricDescription string `db:"MetricDescription"` + MetricUnit string `db:"MetricUnit"` + Attributes map[string]string `db:"Attributes"` + StartTimeUnix string `db:"StartTimeUnix"` + TimeUnix string `db:"TimeUnix"` + Count float64 `db:"Count"` + Sum float64 `db:"Sum"` + Scale int32 `db:"Scale"` + ZeroCount uint64 `db:"ZeroCount"` + PositiveOffset int32 `db:"PositiveOffset"` + PositiveBucketCounts []uint64 `db:"PositiveBucketCounts"` + NegativeOffset int32 `db:"NegativeOffset"` + NegativeBucketCounts []uint64 `db:"NegativeBucketCounts"` + ExemplarsFilteredAttributes []map[string]string `db:"Exemplars.FilteredAttributes"` + ExemplarsTimeUnix []time.Time `db:"Exemplars.TimeUnix"` + ExemplarsValue []float64 `db:"Exemplars.Value"` + ExemplarsSpanID []string `db:"Exemplars.SpanId"` + ExemplarsTraceID []string `db:"Exemplars.TraceId"` + Flags uint32 `db:"Flags"` + Min float64 `db:"Min"` + Max float64 `db:"Max"` + } + + var actualSum sum + + expectSum := sum{ + ResourceAttributes: map[string]string{ + "service.name": "demo 1", + "Resource Attributes 1": "value1", + }, + ResourceSchemaURL: "Resource SchemaUrl 1", + ScopeName: "Scope name 1", + ScopeVersion: "Scope version 1", + ScopeDroppedAttrCount: 10, + ScopeSchemaURL: "Scope SchemaUrl 1", + ScopeAttributes: map[string]string{ + "Scope Attributes 1": "value1", + }, + MetricName: "exp histogram metrics", + MetricDescription: "This is a exp histogram metrics", + MetricUnit: "ms", + Attributes: map[string]string{ + "key": "value", + "key2": "value", + }, + StartTimeUnix: "2023-12-25T09:53:49Z", + TimeUnix: "2023-12-25T09:53:49Z", + Count: 1, + Sum: 1, + Scale: 0, + ZeroCount: 0, + PositiveOffset: 1, + PositiveBucketCounts: []uint64{0, 0, 0, 1, 0}, + NegativeOffset: 1, + NegativeBucketCounts: []uint64{0, 0, 0, 1, 0}, + Flags: 0, + Min: 0, + Max: 1, + ExemplarsFilteredAttributes: []map[string]string{ + { + "key": "value", + "key2": "value2", + }, + }, + ExemplarsTimeUnix: []time.Time{time.Unix(1703498029, 0).UTC()}, + ExemplarsTraceID: []string{"01020300000000000000000000000000"}, + ExemplarsSpanID: []string{"0102030000000000"}, + ExemplarsValue: []float64{54}, + } + + err := db.Get(&actualSum, "select * from default.otel_metrics_exponential_histogram") + require.NoError(t, err) + require.Equal(t, expectSum, actualSum) +} + +func verifySummaryMetric(t *testing.T, db *sqlx.DB) { + type sum struct { + ResourceAttributes map[string]string `db:"ResourceAttributes"` + ResourceSchemaURL string `db:"ResourceSchemaUrl"` + ScopeName string `db:"ScopeName"` + ScopeVersion string `db:"ScopeVersion"` + ScopeAttributes map[string]string `db:"ScopeAttributes"` + ScopeDroppedAttrCount uint32 `db:"ScopeDroppedAttrCount"` + ScopeSchemaURL string `db:"ScopeSchemaUrl"` + MetricName string `db:"MetricName"` + MetricDescription string `db:"MetricDescription"` + MetricUnit string `db:"MetricUnit"` + Attributes map[string]string `db:"Attributes"` + StartTimeUnix string `db:"StartTimeUnix"` + TimeUnix string `db:"TimeUnix"` + Count float64 `db:"Count"` + Sum float64 `db:"Sum"` + Quantile []float64 `db:"ValueAtQuantiles.Quantile"` + QuantilesValue []float64 `db:"ValueAtQuantiles.Value"` + Flags uint32 `db:"Flags"` + } + + var actualSum sum + + expectSum := sum{ + ResourceAttributes: map[string]string{ + "service.name": "demo 1", + "Resource Attributes 1": "value1", + }, + ResourceSchemaURL: "Resource SchemaUrl 1", + ScopeName: "Scope name 1", + ScopeVersion: "Scope version 1", + ScopeDroppedAttrCount: 10, + ScopeSchemaURL: "Scope SchemaUrl 1", + ScopeAttributes: map[string]string{ + "Scope Attributes 1": "value1", + }, + MetricName: "summary metrics", + MetricDescription: "This is a summary metrics", + MetricUnit: "ms", + Attributes: map[string]string{ + "key": "value", + "key2": "value", + }, + StartTimeUnix: "2023-12-25T09:53:49Z", + TimeUnix: "2023-12-25T09:53:49Z", + Count: 1, + Sum: 1, + Quantile: []float64{1}, + QuantilesValue: []float64{1}, + Flags: 0, + } + + err := db.Get(&actualSum, "select * from default.otel_metrics_summary") + require.NoError(t, err) + require.Equal(t, expectSum, actualSum) +} + +func randPort() string { + rs := rand.NewSource(time.Now().Unix()) + r := rand.New(rs) + return strconv.Itoa(r.Intn(999) + 9000) +} diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index e3ccf3a154c5..4ea81bbefefd 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -60,8 +60,8 @@ func TestLoadConfig(t *testing.T) { Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.TypeGzip, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -73,8 +73,8 @@ func TestLoadConfig(t *testing.T) { }, ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -115,8 +115,8 @@ func TestLoadConfig(t *testing.T) { Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.TypeGzip, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -130,8 +130,8 @@ func TestLoadConfig(t *testing.T) { SubSystemAttributes: []string{"service.name", "k8s.deployment.name", "k8s.statefulset.name", "k8s.daemonset.name", "k8s.cronjob.name", "k8s.job.name", "k8s.container.name"}, ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index 9c98356722fd..bbac7634c6d4 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -92,7 +92,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Traces: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -172,8 +172,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Traces: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, @@ -186,7 +186,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ Domain: "localhost", DomainSettings: configgrpc.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, diff --git a/exporter/coralogixexporter/generated_component_test.go b/exporter/coralogixexporter/generated_component_test.go index 229c40148100..18f1b2036164 100644 --- a/exporter/coralogixexporter/generated_component_test.go +++ b/exporter/coralogixexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 8468ccd371ec..ffc244948309 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -5,21 +5,21 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -50,16 +51,16 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index cf13981a5338..1fc86bc17e81 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -1,20 +1,12 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -35,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -82,46 +76,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -151,8 +145,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -173,12 +165,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 2a8f6770cccc..9ebd11698016 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -11,6 +11,7 @@ import ( "strings" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" @@ -319,8 +320,12 @@ type LogsConfig struct { // TagsConfig defines the tag-related configuration // It is embedded in the configuration type TagsConfig struct { - // Hostname is the host name for unified service tagging. - // If unset, it is determined automatically. + // Hostname is the fallback hostname used for payloads without hostname-identifying attributes. + // This option will NOT change the hostname applied to your metrics, traces and logs if they already have hostname-identifying attributes. + // If unset, the hostname will be determined automatically. See https://docs.datadoghq.com/opentelemetry/schema_semantics/hostname/?tab=datadogexporter#fallback-hostname-logic for details. + // + // Prefer using the `datadog.host.name` resource attribute over using this setting. + // See https://docs.datadoghq.com/opentelemetry/schema_semantics/hostname/?tab=datadogexporter#general-hostname-semantic-conventions for details. Hostname string `mapstructure:"hostname"` } @@ -365,11 +370,15 @@ type HostMetadataConfig struct { Enabled bool `mapstructure:"enabled"` // HostnameSource is the source for the hostname of host metadata. + // This hostname is used for identifying the infrastructure list, host map and host tag information related to the host where the Datadog exporter is running. + // Changing this setting will not change the host used to tag your metrics, traces and logs in any way. + // For remote hosts, see https://docs.datadoghq.com/opentelemetry/schema_semantics/host_metadata/. + // // Valid values are 'first_resource' and 'config_or_system': // - 'first_resource' picks the host metadata hostname from the resource // attributes on the first OTLP payload that gets to the exporter. // If the first payload lacks hostname-like attributes, it will fallback to 'config_or_system'. - // Do not use this hostname source if receiving data from multiple hosts. + // **Do not use this hostname source if receiving data from multiple hosts**. // - 'config_or_system' picks the host metadata hostname from the 'hostname' setting, // If this is empty it will use available system APIs and cloud provider endpoints. // @@ -382,24 +391,11 @@ type HostMetadataConfig struct { Tags []string `mapstructure:"tags"` } -// 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 LimitedClientConfig struct { - TLSSetting LimitedTLSClientSettings `mapstructure:"tls,omitempty"` -} - // Config defines configuration for the Datadog exporter. type Config struct { - exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - exporterhelper.QueueSettings `mapstructure:"sending_queue"` - configretry.BackOffConfig `mapstructure:"retry_on_failure"` - - LimitedClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + exporterhelper.QueueSettings `mapstructure:"sending_queue"` + configretry.BackOffConfig `mapstructure:"retry_on_failure"` TagsConfig `mapstructure:",squash"` @@ -442,6 +438,10 @@ var _ component.Config = (*Config)(nil) // Validate the configuration for errors. This is required by component.Config. func (c *Config) Validate() error { + if err := validateClientConfig(c.ClientConfig); err != nil { + return err + } + if c.OnlyMetadata && (!c.HostMetadata.Enabled || c.HostMetadata.HostnameSource != HostnameSourceFirstResource) { return errNoMetadata } @@ -482,6 +482,36 @@ func (c *Config) Validate() error { return nil } +func validateClientConfig(cfg confighttp.ClientConfig) error { + var unsupported []string + if cfg.Auth != nil { + unsupported = append(unsupported, "auth") + } + if cfg.Endpoint != "" { + unsupported = append(unsupported, "endpoint") + } + if cfg.Compression != "" { + unsupported = append(unsupported, "compression") + } + if cfg.ProxyURL != "" { + unsupported = append(unsupported, "proxy_url") + } + if cfg.Headers != nil { + unsupported = append(unsupported, "headers") + } + if cfg.HTTP2ReadIdleTimeout != 0 { + unsupported = append(unsupported, "http2_read_idle_timeout") + } + if cfg.HTTP2PingTimeout != 0 { + unsupported = append(unsupported, "http2_ping_timeout") + } + + if len(unsupported) > 0 { + return fmt.Errorf("these confighttp client configs are currently not respected by Datadog exporter: %s", strings.Join(unsupported, ", ")) + } + return nil +} + var _ error = (*renameError)(nil) // renameError is an error related to a renamed setting. diff --git a/exporter/datadogexporter/config_test.go b/exporter/datadogexporter/config_test.go index c5e21a3a452c..62d244f7ca03 100644 --- a/exporter/datadogexporter/config_test.go +++ b/exporter/datadogexporter/config_test.go @@ -5,12 +5,25 @@ package datadogexporter import ( "testing" + "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configopaque" + "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap" ) func TestValidate(t *testing.T) { + idleConnTimeout := 30 * time.Second + maxIdleConn := 300 + maxIdleConnPerHost := 150 + maxConnPerHost := 250 + ty, err := component.NewType("ty") + assert.NoError(t, err) + auth := configauth.Authentication{AuthenticatorID: component.NewID(ty)} tests := []struct { name string @@ -94,8 +107,8 @@ func TestValidate(t *testing.T) { name: "TLS settings are valid", cfg: &Config{ API: APIConfig{Key: "notnull"}, - LimitedClientConfig: LimitedClientConfig{ - TLSSetting: LimitedTLSClientSettings{ + ClientConfig: confighttp.ClientConfig{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, }, @@ -115,6 +128,40 @@ func TestValidate(t *testing.T) { Traces: TracesConfig{PeerTags: []string{"tag1", "tag2"}}, }, }, + { + name: "With confighttp client configs", + cfg: &Config{ + API: APIConfig{Key: "notnull"}, + ClientConfig: confighttp.ClientConfig{ + ReadBufferSize: 100, + WriteBufferSize: 200, + Timeout: 10 * time.Second, + IdleConnTimeout: &idleConnTimeout, + MaxIdleConns: &maxIdleConn, + MaxIdleConnsPerHost: &maxIdleConnPerHost, + MaxConnsPerHost: &maxConnPerHost, + DisableKeepAlives: true, + TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true}, + }, + }, + }, + + { + name: "unsupported confighttp client configs", + cfg: &Config{ + API: APIConfig{Key: "notnull"}, + ClientConfig: confighttp.ClientConfig{ + Endpoint: "endpoint", + Compression: "gzip", + ProxyURL: "proxy", + Auth: &auth, + Headers: map[string]configopaque.String{"key": "val"}, + HTTP2ReadIdleTimeout: 250, + HTTP2PingTimeout: 200, + }, + }, + err: "these confighttp client configs are currently not respected by Datadog exporter: auth, endpoint, compression, proxy_url, headers, http2_read_idle_timeout, http2_ping_timeout", + }, } for _, testInstance := range tests { t.Run(testInstance.name, func(t *testing.T) { @@ -129,10 +176,26 @@ func TestValidate(t *testing.T) { } func TestUnmarshal(t *testing.T) { + cfgWithHTTPConfigs := NewFactory().CreateDefaultConfig().(*Config) + idleConnTimeout := 30 * time.Second + maxIdleConn := 300 + maxIdleConnPerHost := 150 + maxConnPerHost := 250 + cfgWithHTTPConfigs.ReadBufferSize = 100 + cfgWithHTTPConfigs.WriteBufferSize = 200 + cfgWithHTTPConfigs.Timeout = 10 * time.Second + cfgWithHTTPConfigs.MaxIdleConns = &maxIdleConn + cfgWithHTTPConfigs.MaxIdleConnsPerHost = &maxIdleConnPerHost + cfgWithHTTPConfigs.MaxConnsPerHost = &maxConnPerHost + cfgWithHTTPConfigs.IdleConnTimeout = &idleConnTimeout + cfgWithHTTPConfigs.DisableKeepAlives = true + cfgWithHTTPConfigs.TLSSetting.InsecureSkipVerify = true + cfgWithHTTPConfigs.warnings = nil + tests := []struct { name string configMap *confmap.Conf - cfg Config + cfg *Config err string }{ { @@ -264,6 +327,21 @@ func TestUnmarshal(t *testing.T) { }), err: "\"metrics::sums::initial_cumulative_monotonic_value\" can only be configured when \"metrics::sums::cumulative_monotonic_mode\" is set to \"to_delta\"", }, + { + name: "unmarshall confighttp client configs", + configMap: confmap.NewFromStringMap(map[string]any{ + "read_buffer_size": 100, + "write_buffer_size": 200, + "timeout": "10s", + "max_idle_conns": 300, + "max_idle_conns_per_host": 150, + "max_conns_per_host": 250, + "disable_keep_alives": true, + "idle_conn_timeout": "30s", + "tls": map[string]any{"insecure_skip_verify": true}, + }), + cfg: cfgWithHTTPConfigs, + }, } f := NewFactory() diff --git a/exporter/datadogexporter/examples/collector.yaml b/exporter/datadogexporter/examples/collector.yaml index 7ff925228c67..ec0ae11ae1bb 100644 --- a/exporter/datadogexporter/examples/collector.yaml +++ b/exporter/datadogexporter/examples/collector.yaml @@ -171,8 +171,12 @@ exporters: # The Datadog exporter is necessary for exporting telemetry signals to Datadog. datadog: ## @param hostname - string - optional - ## A custom hostname. - ## If unset, this will be determined automatically if possible. + ## The fallback hostname used for payloads without hostname-identifying attributes. + ## This option will NOT change the hostname applied to your metrics, traces and logs if they already have hostname-identifying attributes. + ## If unset, the hostname will be determined automatically. See https://docs.datadoghq.com/opentelemetry/schema_semantics/hostname/?tab=datadogexporter#fallback-hostname-logic for details. + ## + ## Prefer using the `datadog.host.name` resource attribute over using this setting. + ## See https://docs.datadoghq.com/opentelemetry/schema_semantics/hostname/?tab=datadogexporter#general-hostname-semantic-conventions for details. # # hostname: customhostname @@ -210,6 +214,27 @@ exporters: ## @param tls - boolean - optional - default: false # insecure_skip_verify: false + ## @param read_buffer_size - integer - optional + ## @param write_buffer_size - integer - optional + ## @param timeout - duration - optional + ## @param max_idle_conns - integer - optional + ## @param max_idle_conns_per_host - integer - optional + ## @param max_conns_per_host - integer - optional + ## @param idle_conn_timeout - duration - optional + ## @param disable_keep_alives - boolean - optional + ## + ## Below are a subset of configs in confighttp that are respected by Datadog exporter. + ## See https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp for details on these configs. + ## + # read_buffer_size: 0 + # write_buffer_size: 0 + # timeout: 15s + # max_idle_conns: 100 + # max_idle_conns_per_host: 0 + # max_conns_per_host: 0 + # idle_conn_timeout: 0s + # disable_keep_alives: false + ## @param metrics - custom object - optional ## Metric exporter specific configuration. # @@ -373,8 +398,9 @@ exporters: ## Host metadata specific configuration. ## Host metadata is the information used for populating the infrastructure list, the host map and providing host tags functionality within the Datadog app. ## - ## The exporter will only send host metadata for a single host, whose name is chosen + ## By default, the exporter will only send host metadata for a single host, whose name is chosen ## according to `host_metadata::hostname_source`. + ## See https://docs.datadoghq.com/opentelemetry/schema_semantics/host_metadata/ to send host metadata about more hosts. # # host_metadata: ## @param enabled - boolean - optional - default: true @@ -384,10 +410,14 @@ exporters: ## @param hostname_source - enum - optional - default: config_or_system ## Source for the hostname of host metadata. + ## This hostname is used for identifying the infrastructure list, host map and host tag information related to the host where the Datadog exporter is running. + ## Changing this setting will not change the host used to tag your metrics, traces and logs in any way. + ## For remote hosts, see https://docs.datadoghq.com/opentelemetry/schema_semantics/host_metadata/. + ## ## Valid values are 'first_resource' and 'config_or_system': ## - 'first_resource' picks the host metadata hostname from the resource attributes on the first OTLP payload that gets to the exporter. ## If the first payload lacks hostname-like attributes, it will fallback to 'config_or_system' behavior. - ## Do not use this hostname source if receiving data from multiple hosts. + ## **Do not use this hostname source if receiving data from multiple hosts**. ## ## - 'config_or_system' picks the host metadata hostname from the 'hostname' setting, falling back to system and cloud provider APIs. ## diff --git a/exporter/datadogexporter/examples/logs.yaml b/exporter/datadogexporter/examples/logs.yaml index 46d56acc690e..15d9ba66c001 100644 --- a/exporter/datadogexporter/examples/logs.yaml +++ b/exporter/datadogexporter/examples/logs.yaml @@ -23,6 +23,7 @@ processors: exporters: datadog: + idle_conn_timeout: 10s api: site: ${env:DD_SITE} key: ${env:DD_API_KEY} diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index cb9bcaf55697..4f8d86117992 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -19,6 +19,7 @@ import ( "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer" @@ -29,7 +30,6 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - "go.opentelemetry.io/otel/metric/noop" "go.uber.org/zap" "google.golang.org/protobuf/proto" @@ -105,9 +105,6 @@ func (f *factory) SourceProvider(set component.TelemetrySettings, configHostname func (f *factory) AttributesTranslator(set component.TelemetrySettings) (*attributes.Translator, error) { f.onceAttributesTranslator.Do(func() { - // disable metrics for the translator - // Metrics are disabled until we figure out the details on how do we want to report the metric. - set.MeterProvider = noop.NewMeterProvider() f.attributesTranslator, f.attributesErr = attributes.NewTranslator(set) }) return f.attributesTranslator, f.attributesErr @@ -170,8 +167,9 @@ func NewFactory() exporter.Factory { return newFactoryWithRegistry(featuregate.GlobalRegistry()) } -func defaulttimeoutSettings() exporterhelper.TimeoutSettings { - return exporterhelper.TimeoutSettings{ +func defaultClientConfig() confighttp.ClientConfig { + // do not use NewDefaultClientConfig for backwards-compatibility + return confighttp.ClientConfig{ Timeout: 15 * time.Second, } } @@ -179,9 +177,9 @@ func defaulttimeoutSettings() exporterhelper.TimeoutSettings { // createDefaultConfig creates the default exporter configuration func (f *factory) createDefaultConfig() component.Config { return &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), API: APIConfig{ Site: "datadoghq.com", @@ -357,7 +355,8 @@ func (f *factory) createMetricsExporter( exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: true}), exporterhelper.WithQueue(cfg.QueueSettings), exporterhelper.WithShutdown(func(context.Context) error { - cancel() + cancel() // first cancel context + f.wg.Wait() // then wait for shutdown f.StopReporter() statsWriter.Stop() if statsIn != nil { diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index 7e82bf1c6c7f..5e65c366a279 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -71,9 +71,9 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), API: APIConfig{ Site: "datadoghq.com", @@ -132,9 +132,9 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "default"), expected: &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), API: APIConfig{ Key: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Site: "datadoghq.com", @@ -180,9 +180,9 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "api"), expected: &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), TagsConfig: TagsConfig{ Hostname: "customhostname", }, @@ -235,9 +235,9 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "api2"), expected: &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), TagsConfig: TagsConfig{ Hostname: "customhostname", }, @@ -620,9 +620,9 @@ func TestOnlyMetadata(t *testing.T) { factory := NewFactory() ctx := context.Background() cfg := &Config{ - TimeoutSettings: defaulttimeoutSettings(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), + ClientConfig: defaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), API: APIConfig{Key: "notnull"}, Metrics: MetricsConfig{TCPAddrConfig: confignet.TCPAddrConfig{Endpoint: server.URL}}, diff --git a/exporter/datadogexporter/generated_component_test.go b/exporter/datadogexporter/generated_component_test.go index 0938f49b1bec..067e8b463c87 100644 --- a/exporter/datadogexporter/generated_component_test.go +++ b/exporter/datadogexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index dd439f9abfb2..fd36a3fcadc8 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -18,6 +18,7 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 github.com/aws/aws-sdk-go v1.50.27 github.com/cenkalti/backoff/v4 v4.2.1 + github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 @@ -34,23 +35,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -58,8 +63,8 @@ require ( google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -126,10 +131,9 @@ require ( github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect @@ -211,9 +215,9 @@ require ( github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 // indirect @@ -231,25 +235,21 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -271,23 +271,23 @@ require ( golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.150.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 364c32e8cff3..8ba2b8bdbf62 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -331,8 +331,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -669,8 +669,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -678,8 +678,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -782,82 +782,82 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -1003,8 +1003,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1165,8 +1165,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1241,8 +1241,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -1295,14 +1295,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/exporter/datadogexporter/hostmetadata.go b/exporter/datadogexporter/hostmetadata.go index 82fa74aa7dd5..1338bed2fb54 100644 --- a/exporter/datadogexporter/hostmetadata.go +++ b/exporter/datadogexporter/hostmetadata.go @@ -16,7 +16,7 @@ func newMetadataConfigfromConfig(cfg *Config) hostmetadata.PusherConfig { APIKey: string(cfg.API.Key), UseResourceMetadata: cfg.HostMetadata.HostnameSource == HostnameSourceFirstResource, InsecureSkipVerify: cfg.TLSSetting.InsecureSkipVerify, - TimeoutSettings: cfg.TimeoutSettings, + ClientConfig: cfg.ClientConfig, RetrySettings: cfg.BackOffConfig, } } diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 0b8bf087e95f..87d51eb2313b 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 @@ -80,7 +80,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -127,8 +127,8 @@ require ( github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.24.2 // indirect @@ -140,31 +140,31 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect @@ -184,24 +184,24 @@ require ( golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index da50b598e167..85a5e7fa9b0d 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -268,8 +268,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -509,12 +509,12 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -590,82 +590,82 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -793,8 +793,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -913,8 +913,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -968,8 +968,8 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -1015,14 +1015,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/exporter/datadogexporter/internal/clientutil/api.go b/exporter/datadogexporter/internal/clientutil/api.go index 616627d9b9f0..60bbaeb36dec 100644 --- a/exporter/datadogexporter/internal/clientutil/api.go +++ b/exporter/datadogexporter/internal/clientutil/api.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/config/confighttp" "go.uber.org/zap" zorkian "gopkg.in/zorkian/go-datadog-api.v2" ) @@ -20,10 +20,10 @@ import ( var GZipSubmitMetricsOptionalParameters = datadogV2.NewSubmitMetricsOptionalParameters().WithContentEncoding(datadogV2.METRICCONTENTENCODING_GZIP) // CreateAPIClient creates a new Datadog API client -func CreateAPIClient(buildInfo component.BuildInfo, endpoint string, settings exporterhelper.TimeoutSettings, insecureSkipVerify bool) *datadog.APIClient { +func CreateAPIClient(buildInfo component.BuildInfo, endpoint string, hcs confighttp.ClientConfig) *datadog.APIClient { configuration := datadog.NewConfiguration() configuration.UserAgent = UserAgent(buildInfo) - configuration.HTTPClient = NewHTTPClient(settings, insecureSkipVerify) + configuration.HTTPClient = NewHTTPClient(hcs) configuration.Compress = true configuration.Servers = datadog.ServerConfigurations{ { diff --git a/exporter/datadogexporter/internal/clientutil/http.go b/exporter/datadogexporter/internal/clientutil/http.go index 2b19d3c22d67..4b69ebdef6e3 100644 --- a/exporter/datadogexporter/internal/clientutil/http.go +++ b/exporter/datadogexporter/internal/clientutil/http.go @@ -11,7 +11,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/config/confighttp" ) var ( @@ -27,21 +27,50 @@ var ( } ) -// NewHTTPClient returns a http.Client configured with the Agent options. -func NewHTTPClient(settings exporterhelper.TimeoutSettings, insecureSkipVerify bool) *http.Client { +// NewHTTPClient returns a http.Client configured with a subset of the confighttp.ClientConfig options. +func NewHTTPClient(hcs confighttp.ClientConfig) *http.Client { + transport := http.Transport{ + Proxy: http.ProxyFromEnvironment, + // Default values consistent with https://github.com/DataDog/datadog-agent/blob/f9ae7f4b842f83b23b2dfe3f15d31f9e6b12e857/pkg/util/http/transport.go#L91-L106 + DialContext: (&net.Dialer{ + Timeout: 30 * time.Second, + // Enables TCP keepalives to detect broken connections + KeepAlive: 30 * time.Second, + // Disable RFC 6555 Fast Fallback ("Happy Eyeballs") + FallbackDelay: -1 * time.Nanosecond, + }).DialContext, + MaxIdleConns: 100, + MaxIdleConnsPerHost: 5, + // This parameter is set to avoid connections sitting idle in the pool indefinitely + IdleConnTimeout: 45 * time.Second, + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, + // Not supported by intake + ForceAttemptHTTP2: false, + TLSClientConfig: &tls.Config{InsecureSkipVerify: hcs.TLSSetting.InsecureSkipVerify}, + } + if hcs.ReadBufferSize > 0 { + transport.ReadBufferSize = hcs.ReadBufferSize + } + if hcs.WriteBufferSize > 0 { + transport.WriteBufferSize = hcs.WriteBufferSize + } + if hcs.MaxIdleConns != nil { + transport.MaxIdleConns = *hcs.MaxIdleConns + } + if hcs.MaxIdleConnsPerHost != nil { + transport.MaxIdleConnsPerHost = *hcs.MaxIdleConnsPerHost + } + if hcs.MaxConnsPerHost != nil { + transport.MaxConnsPerHost = *hcs.MaxConnsPerHost + } + if hcs.IdleConnTimeout != nil { + transport.IdleConnTimeout = *hcs.IdleConnTimeout + } + transport.DisableKeepAlives = hcs.DisableKeepAlives return &http.Client{ - Timeout: settings.Timeout, - Transport: &http.Transport{ - Proxy: http.ProxyFromEnvironment, - DialContext: (&net.Dialer{ - // Disable RFC 6555 Fast Fallback ("Happy Eyeballs") - FallbackDelay: -1 * time.Nanosecond, - }).DialContext, - MaxIdleConns: 100, - // Not supported by intake - ForceAttemptHTTP2: false, - TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify}, - }, + Timeout: hcs.Timeout, + Transport: &transport, } } diff --git a/exporter/datadogexporter/internal/clientutil/http_test.go b/exporter/datadogexporter/internal/clientutil/http_test.go index db6e02360a46..db2eea93cb50 100644 --- a/exporter/datadogexporter/internal/clientutil/http_test.go +++ b/exporter/datadogexporter/internal/clientutil/http_test.go @@ -4,11 +4,18 @@ package clientutil // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/clientutil" import ( + "crypto/tls" "net/http" "testing" + "time" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configcompression" + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configtls" ) var ( @@ -18,6 +25,73 @@ var ( } ) +func TestNewHTTPClient(t *testing.T) { + hcsEmpty := confighttp.ClientConfig{} + client1 := NewHTTPClient(hcsEmpty) + defaultTransport := &http.Transport{ + MaxIdleConns: 100, + MaxIdleConnsPerHost: 5, + IdleConnTimeout: 45 * time.Second, + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, + ForceAttemptHTTP2: false, + TLSClientConfig: &tls.Config{InsecureSkipVerify: false}, + } + if diff := cmp.Diff( + defaultTransport, + client1.Transport.(*http.Transport), + cmpopts.IgnoreUnexported(http.Transport{}, tls.Config{}), + cmpopts.IgnoreFields(http.Transport{}, "Proxy", "DialContext")); diff != "" { + t.Errorf("Mismatched transports -want +got %s", diff) + } + assert.Equal(t, time.Duration(0), client1.Timeout) + + idleConnTimeout := 30 * time.Second + maxIdleConn := 300 + maxIdleConnPerHost := 150 + maxConnPerHost := 250 + hcs := confighttp.ClientConfig{ + ReadBufferSize: 100, + WriteBufferSize: 200, + Timeout: 10 * time.Second, + IdleConnTimeout: &idleConnTimeout, + MaxIdleConns: &maxIdleConn, + MaxIdleConnsPerHost: &maxIdleConnPerHost, + MaxConnsPerHost: &maxConnPerHost, + DisableKeepAlives: true, + TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true}, + + // The rest are ignored + Endpoint: "endpoint", + ProxyURL: "proxy", + Compression: configcompression.TypeSnappy, + HTTP2ReadIdleTimeout: 15 * time.Second, + HTTP2PingTimeout: 20 * time.Second, + } + client2 := NewHTTPClient(hcs) + expectedTransport := &http.Transport{ + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, + ReadBufferSize: 100, + WriteBufferSize: 200, + MaxIdleConns: maxIdleConn, + MaxIdleConnsPerHost: maxIdleConnPerHost, + MaxConnsPerHost: maxConnPerHost, + IdleConnTimeout: idleConnTimeout, + DisableKeepAlives: true, + ForceAttemptHTTP2: false, + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + } + if diff := cmp.Diff( + expectedTransport, + client2.Transport.(*http.Transport), + cmpopts.IgnoreUnexported(http.Transport{}, tls.Config{}), + cmpopts.IgnoreFields(http.Transport{}, "Proxy", "DialContext")); diff != "" { + t.Errorf("Mismatched transports -want +got %s", diff) + } + assert.Equal(t, 10*time.Second, client2.Timeout) +} + func TestUserAgent(t *testing.T) { assert.Equal(t, UserAgent(buildInfo), "otelcontribcol/1.0") diff --git a/exporter/datadogexporter/internal/hostmetadata/config.go b/exporter/datadogexporter/internal/hostmetadata/config.go index 330e792abcc4..d5c4a3e34160 100644 --- a/exporter/datadogexporter/internal/hostmetadata/config.go +++ b/exporter/datadogexporter/internal/hostmetadata/config.go @@ -4,8 +4,8 @@ package hostmetadata // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/hostmetadata" import ( + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configretry" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) // PusherConfig is the configuration for the metadata pusher goroutine. @@ -22,8 +22,8 @@ type PusherConfig struct { UseResourceMetadata bool // InsecureSkipVerify is the value of `tls.insecure_skip_verify` on the configuration. InsecureSkipVerify bool - // TimeoutSettings of exporter. - TimeoutSettings exporterhelper.TimeoutSettings + // ClientConfig of exporter. + ClientConfig confighttp.ClientConfig // RetrySettings of exporter. RetrySettings configretry.BackOffConfig } diff --git a/exporter/datadogexporter/internal/hostmetadata/internal/gohai/gohai.go b/exporter/datadogexporter/internal/hostmetadata/internal/gohai/gohai.go index c4d64a4057c4..344ae0746a1a 100644 --- a/exporter/datadogexporter/internal/hostmetadata/internal/gohai/gohai.go +++ b/exporter/datadogexporter/internal/hostmetadata/internal/gohai/gohai.go @@ -26,7 +26,7 @@ func newGohai(logger *zap.Logger) *gohai.Gohai { res := new(gohai.Gohai) if p, err := new(cpu.Cpu).Collect(); err != nil { - logger.Info("Failed to retrieve cpu metadata", zap.Error(err)) + logger.Debug("Failed to retrieve cpu metadata", zap.Error(err)) } else if cpu, ok := p.(map[string]string); !ok { logger.Warn("Internal error: Failed to cast cpu metadata to map[string]string", zap.Any("cpu", p)) } else { @@ -34,7 +34,7 @@ func newGohai(logger *zap.Logger) *gohai.Gohai { } if p, err := new(filesystem.FileSystem).Collect(); err != nil { - logger.Info("Failed to retrieve filesystem metadata", zap.Error(err)) + logger.Debug("Failed to retrieve filesystem metadata", zap.Error(err)) } else if fs, ok := p.([]any); !ok { logger.Warn("Internal error: Failed to cast filesystem metadata to []any", zap.Any("filesystem", p)) } else { @@ -42,7 +42,7 @@ func newGohai(logger *zap.Logger) *gohai.Gohai { } if p, err := new(memory.Memory).Collect(); err != nil { - logger.Info("Failed to retrieve memory metadata", zap.Error(err)) + logger.Debug("Failed to retrieve memory metadata", zap.Error(err)) } else if mem, ok := p.(map[string]string); !ok { logger.Warn("Internal error: Failed to cast memory metadata to map[string]string", zap.Any("memory", p)) } else { @@ -51,7 +51,7 @@ func newGohai(logger *zap.Logger) *gohai.Gohai { // in case of containerized environment, this would return pod id not node's ip if p, err := new(network.Network).Collect(); err != nil { - logger.Info("Failed to retrieve network metadata", zap.Error(err)) + logger.Debug("Failed to retrieve network metadata", zap.Error(err)) } else if net, ok := p.(map[string]any); !ok { logger.Warn("Internal error: Failed to cast network metadata to map[string]any", zap.Any("network", p)) } else { @@ -59,7 +59,7 @@ func newGohai(logger *zap.Logger) *gohai.Gohai { } if p, err := new(platform.Platform).Collect(); err != nil { - logger.Info("Failed to retrieve platform metadata", zap.Error(err)) + logger.Debug("Failed to retrieve platform metadata", zap.Error(err)) } else if platform, ok := p.(map[string]string); !ok { logger.Warn("Internal error: Failed to cast platform metadata to map[string]string", zap.Any("platform", p)) } else { diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata.go b/exporter/datadogexporter/internal/hostmetadata/metadata.go index ed4ea8626c77..700f20269127 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata.go @@ -144,7 +144,7 @@ func NewPusher(params exporter.CreateSettings, pcfg PusherConfig) inframetadata. params: params, pcfg: pcfg, retrier: clientutil.NewRetrier(params.Logger, pcfg.RetrySettings, scrub.NewScrubber()), - httpClient: clientutil.NewHTTPClient(pcfg.TimeoutSettings, pcfg.InsecureSkipVerify), + httpClient: clientutil.NewHTTPClient(pcfg.ClientConfig), } } diff --git a/exporter/datadogexporter/internal/logs/sender.go b/exporter/datadogexporter/internal/logs/sender.go index 016bc68da510..7aa6d26cec4d 100644 --- a/exporter/datadogexporter/internal/logs/sender.go +++ b/exporter/datadogexporter/internal/logs/sender.go @@ -8,7 +8,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" - "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/config/confighttp" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/clientutil" @@ -27,7 +27,7 @@ type Sender struct { const logsV2 = "v2.LogsApi.SubmitLog" // NewSender creates a new Sender -func NewSender(endpoint string, logger *zap.Logger, s exporterhelper.TimeoutSettings, insecureSkipVerify, verbose bool, apiKey string) *Sender { +func NewSender(endpoint string, logger *zap.Logger, hcs confighttp.ClientConfig, verbose bool, apiKey string) *Sender { cfg := datadog.NewConfiguration() logger.Info("Logs sender initialized", zap.String("endpoint", endpoint)) cfg.OperationServers[logsV2] = datadog.ServerConfigurations{ @@ -35,7 +35,7 @@ func NewSender(endpoint string, logger *zap.Logger, s exporterhelper.TimeoutSett URL: endpoint, }, } - cfg.HTTPClient = clientutil.NewHTTPClient(s, insecureSkipVerify) + cfg.HTTPClient = clientutil.NewHTTPClient(hcs) cfg.AddDefaultHeader("DD-API-KEY", apiKey) apiClient := datadog.NewAPIClient(cfg) return &Sender{ diff --git a/exporter/datadogexporter/internal/logs/sender_test.go b/exporter/datadogexporter/internal/logs/sender_test.go index fe95e1360162..cb74c4abf785 100644 --- a/exporter/datadogexporter/internal/logs/sender_test.go +++ b/exporter/datadogexporter/internal/logs/sender_test.go @@ -12,7 +12,8 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configtls" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/testutil" @@ -191,7 +192,7 @@ func TestSubmitLogs(t *testing.T) { } }) defer server.Close() - s := NewSender(server.URL, logger, exporterhelper.TimeoutSettings{Timeout: time.Second * 10}, true, true, "") + s := NewSender(server.URL, logger, confighttp.ClientConfig{Timeout: time.Second * 10, TLSSetting: configtls.ClientConfig{InsecureSkipVerify: true}}, true, "") if err := s.SubmitLogs(context.Background(), tt.payload); err != nil { t.Fatal(err) } diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index 58c8de9275f2..37d0a52b1675 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -56,8 +56,7 @@ func newLogsExporter( apiClient := clientutil.CreateAPIClient( params.BuildInfo, cfg.Metrics.TCPAddrConfig.Endpoint, - cfg.TimeoutSettings, - cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) + cfg.ClientConfig) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() } else { client := clientutil.CreateZorkianClient(string(cfg.API.Key), cfg.Metrics.TCPAddrConfig.Endpoint) @@ -74,7 +73,7 @@ func newLogsExporter( if err != nil { return nil, fmt.Errorf("failed to create logs translator: %w", err) } - s := logs.NewSender(cfg.Logs.TCPAddrConfig.Endpoint, params.Logger, cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify, cfg.Logs.DumpPayloads, string(cfg.API.Key)) + s := logs.NewSender(cfg.Logs.TCPAddrConfig.Endpoint, params.Logger, cfg.ClientConfig, 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 332bffd9ed14..94709256d1b5 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -126,14 +126,13 @@ func newMetricsExporter( apiClient := clientutil.CreateAPIClient( params.BuildInfo, cfg.Metrics.TCPAddrConfig.Endpoint, - cfg.TimeoutSettings, - cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) + cfg.ClientConfig) 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.TCPAddrConfig.Endpoint) client.ExtraHeader["User-Agent"] = clientutil.UserAgent(params.BuildInfo) - client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) + client.HttpClient = clientutil.NewHTTPClient(cfg.ClientConfig) 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 d64af8958b67..05088b2f3db9 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -73,8 +73,7 @@ func newTracesExporter( apiClient := clientutil.CreateAPIClient( params.BuildInfo, cfg.Metrics.TCPAddrConfig.Endpoint, - cfg.TimeoutSettings, - cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) + cfg.ClientConfig) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() exp.metricsAPI = datadogV2.NewMetricsApi(apiClient) } else { @@ -207,7 +206,7 @@ func newTraceAgentConfig(ctx context.Context, params exporter.CreateSettings, cf 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.LimitedClientConfig.TLSSetting.InsecureSkipVerify + acfg.SkipSSLValidation = cfg.ClientConfig.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 d8703a93e2aa..db281db493a8 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.96.0 github.com/scalyr/dataset-go v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 ) @@ -47,11 +47,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -62,7 +62,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index 78fb72f77b21..ffd9cae53ab3 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -70,28 +70,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -145,8 +145,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/dynatraceexporter/generated_component_test.go b/exporter/dynatraceexporter/generated_component_test.go index b31a9a2ae4d9..cf9af9d2bc5f 100644 --- a/exporter/dynatraceexporter/generated_component_test.go +++ b/exporter/dynatraceexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 97f6993c0db2..074ff944b581 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -8,15 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,6 +36,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,15 +53,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -71,7 +72,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 28525f2499ac..ae4b310fe965 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -31,6 +31,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -78,42 +80,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -167,8 +169,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index ae31e474dce4..0e095b6c6796 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -689,8 +689,8 @@ func Test_exporter_start_InvalidClientConfig(t *testing.T) { cfg := &config.Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index b30f486c4116..63dfe75dde89 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -90,7 +90,7 @@ type ClientConfig struct { // will be send with each HTTP request. Headers map[string]string `mapstructure:"headers,omitempty"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` } // AuthenticationSettings defines user authentication related settings. diff --git a/exporter/elasticsearchexporter/elasticsearch_bulk.go b/exporter/elasticsearchexporter/elasticsearch_bulk.go index b0ad977cd1a6..9885b70a4127 100644 --- a/exporter/elasticsearchexporter/elasticsearch_bulk.go +++ b/exporter/elasticsearchexporter/elasticsearch_bulk.go @@ -65,7 +65,7 @@ func (*clientLogger) ResponseBodyEnabled() bool { } func newElasticsearchClient(logger *zap.Logger, config *Config) (*esClientCurrent, error) { - tlsCfg, err := config.TLSClientSetting.LoadTLSConfig() + tlsCfg, err := config.ClientConfig.LoadTLSConfig() if err != nil { return nil, err } diff --git a/exporter/elasticsearchexporter/generated_component_test.go b/exporter/elasticsearchexporter/generated_component_test.go index 8f123f42726f..57761a699ae0 100644 --- a/exporter/elasticsearchexporter/generated_component_test.go +++ b/exporter/elasticsearchexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 04b057d6d77d..4b78d7d596b4 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -47,12 +48,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -62,7 +63,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 55cc7c5541b9..05825bfd9b18 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -77,32 +79,32 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -154,8 +156,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/fileexporter/README.md b/exporter/fileexporter/README.md index c5cebb2ac942..986343386155 100644 --- a/exporter/fileexporter/README.md +++ b/exporter/fileexporter/README.md @@ -25,9 +25,9 @@ Exporter supports the following features： + Support for compressing the telemetry data before exporting. ++ Support for writing into multiple files, where the file path is determined by a resource attribute. Please note that there is no guarantee that exact field names will remain stable. -This intended for primarily for debugging Collector without setting up backends. The official [opentelemetry-collector-contrib container](https://hub.docker.com/r/otel/opentelemetry-collector-contrib/tags#!) does not have a writable filesystem by default since it's built on the `scratch` layer. As such, you will need to create a writable directory for the path, potentially by mounting writable volumes or creating a custom image. @@ -47,10 +47,17 @@ The following settings are optional: - localtime : [default: false (use UTC)] whether or not the timestamps in backup files is formatted according to the host's local time. - `format`[default: json]: define the data format of encoded telemetry data. The setting can be overridden with `proto`. +- `encoding`[default: none]: if specified, uses an encoding extension to encode telemetry data. Overrides `format`. +- `append`[default: `false`] defines whether append to the file (`true`) or truncate (`false`). If `append: true` is set then setting `rotation` or `compression` is currently not supported. - `compression`[no default]: the compression algorithm used when exporting telemetry data to file. Supported compression algorithms:`zstd` - `flush_interval`[default: 1s]: `time.Duration` interval between flushes. See [time.ParseDuration](https://pkg.go.dev/time#ParseDuration) for valid formats. NOTE: a value without unit is in nanoseconds and `flush_interval` is ignored and writes are not buffered if `rotation` is set. +- `group_by` enables writing to separate files based on a resource attribute. + - enabled: [default: false] enables group_by. When group_by is enabled, rotation setting is ignored. + - resource_attribute: [default: fileexporter.path_segment]: specifies the name of the resource attribute that contains the path segment of the file to write to. The final path will be the `path` config value, with the `*` replaced with the value of this resource attribute. + - max_open_files: [default: 100]: specifies the maximum number of open file descriptors for the output files. + ## File Rotation Telemetry data is exported to a single file by default. `fileexporter` only enables file rotation when the user specifies `rotation:` in the config. However, if specified, related default settings would apply. @@ -78,6 +85,15 @@ When `format` is json and `compression` is none , telemetry data is written to f Otherwise, when using `proto` format or any kind of encoding, each encoded object is preceded by 4 bytes (an unsigned 32 bit integer) which represent the number of bytes contained in the encoded object.When we need read the messages back in, we read the size, then read the bytes into a separate buffer, then parse from that buffer. +## Group by attribute + +By specifying `group_by.resource_attribute` in the config, the exporter will determine a filepath for each telemetry record, by substituting the value of the resource attribute into the `path` configuration value. + +The final path is guaranteed to start with the prefix part of the `path` config value (the part before the `*` character). For example if `path` is "/data/*.json", and the resource attribute value is "../etc/my_config", then the final path will be sanitized to "/data/etc/my_config.json". + +The final path can contain path separators (`/`). The exporter will create missing directories recursively (similarly to `mkdir -p`). + +Grouping by attribute currently only supports a **single** **resource** attribute. If you would like to use multiple attributes, please use [Transform processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/transformprocessor) create a routing key. If you would like to use a non-resource level (eg: Log/Metric/DataPoint) attribute, please use [Group by Attributes processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/groupbyattrsprocessor) first. ## Example: diff --git a/exporter/fileexporter/config.go b/exporter/fileexporter/config.go index 01b228301eef..bdd05dd278b5 100644 --- a/exporter/fileexporter/config.go +++ b/exporter/fileexporter/config.go @@ -5,6 +5,8 @@ package fileexporter // import "github.com/open-telemetry/opentelemetry-collecto import ( "errors" + "fmt" + "strings" "time" "go.opentelemetry.io/collector/component" @@ -22,7 +24,14 @@ type Config struct { // Path of the file to write to. Path is relative to current directory. Path string `mapstructure:"path"` - // Rotation defines an option about rotation of telemetry files + // Mode defines whether the exporter should append to the file. + // Options: + // - false[default]: truncates the file + // - true: appends to the file. + Append bool `mapstructure:"append"` + + // Rotation defines an option about rotation of telemetry files. Ignored + // when GroupByAttribute is used. Rotation *Rotation `mapstructure:"rotation"` // FormatType define the data format of encoded telemetry data @@ -31,6 +40,10 @@ type Config struct { // - proto: OTLP binary protobuf bytes. FormatType string `mapstructure:"format"` + // Encoding defines the encoding of the telemetry data. + // If specified, it overrides `FormatType` and applies an encoding extension. + Encoding *component.ID `mapstructure:"encoding"` + // Compression Codec used to export telemetry data // Supported compression algorithms:`zstd` Compression string `mapstructure:"compression"` @@ -38,6 +51,9 @@ type Config struct { // FlushInterval is the duration between flushes. // See time.ParseDuration for valid values. FlushInterval time.Duration `mapstructure:"flush_interval"` + + // GroupBy enables writing to separate files based on a resource attribute. + GroupBy *GroupBy `mapstructure:"group_by"` } // Rotation an option to rolling log files @@ -63,6 +79,21 @@ type Rotation struct { LocalTime bool `mapstructure:"localtime"` } +type GroupBy struct { + // Enables group_by. When group_by is enabled, rotation setting is ignored. Default is false. + Enabled bool `mapstructure:"enabled"` + + // ResourceAttribute specifies the name of the resource attribute that + // contains the path segment of the file to write to. The final path will be + // the Path config value, with the * replaced with the value of this resource + // attribute. Default is "fileexporter.path_segment". + ResourceAttribute string `mapstructure:"resource_attribute"` + + // MaxOpenFiles specifies the maximum number of open file descriptors for the output files. + // The default is 100. + MaxOpenFiles int `mapstructure:"max_open_files"` +} + var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid @@ -70,6 +101,12 @@ func (cfg *Config) Validate() error { if cfg.Path == "" { return errors.New("path must be non-empty") } + if cfg.Append && cfg.Compression != "" { + return fmt.Errorf("append and compression enabled at the same time is not supported") + } + if cfg.Append && cfg.Rotation != nil { + return fmt.Errorf("append and rotation enabled at the same time is not supported") + } if cfg.FormatType != formatTypeJSON && cfg.FormatType != formatTypeProto { return errors.New("format type is not supported") } @@ -79,6 +116,22 @@ func (cfg *Config) Validate() error { if cfg.FlushInterval < 0 { return errors.New("flush_interval must be larger than zero") } + + if cfg.GroupBy != nil && cfg.GroupBy.Enabled { + pathParts := strings.Split(cfg.Path, "*") + if len(pathParts) != 2 { + return errors.New("path must contain exatcly one * when group_by is enabled") + } + + if len(pathParts[0]) == 0 { + return errors.New("path must not start with * when group_by is enabled") + } + + if cfg.GroupBy.ResourceAttribute == "" { + return errors.New("resource_attribute must not be empty when group_by is enabled") + } + } + return nil } diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index c2bfdb17822b..2e588047406e 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -39,6 +39,10 @@ func TestLoadConfig(t *testing.T) { }, FormatType: formatTypeJSON, FlushInterval: time.Second, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -54,6 +58,10 @@ func TestLoadConfig(t *testing.T) { FormatType: formatTypeProto, Compression: compressionZSTD, FlushInterval: time.Second, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -65,6 +73,10 @@ func TestLoadConfig(t *testing.T) { MaxBackups: defaultMaxBackups, }, FlushInterval: time.Second, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -77,6 +89,10 @@ func TestLoadConfig(t *testing.T) { }, FormatType: formatTypeJSON, FlushInterval: time.Second, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -93,6 +109,10 @@ func TestLoadConfig(t *testing.T) { Path: "./flushed", FlushInterval: 5, FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -101,6 +121,10 @@ func TestLoadConfig(t *testing.T) { Path: "./flushed", FlushInterval: 5 * time.Second, FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -109,6 +133,10 @@ func TestLoadConfig(t *testing.T) { Path: "./flushed", FlushInterval: 500 * time.Millisecond, FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, }, }, { @@ -119,6 +147,44 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, ""), errorMessage: "path must be non-empty", }, + { + id: component.NewIDWithName(metadata.Type, "group_by"), + expected: &Config{ + Path: "./group_by/*.json", + FlushInterval: time.Second, + FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: 10, + ResourceAttribute: "dummy", + }, + }, + }, + { + id: component.NewIDWithName(metadata.Type, "group_by_defaults"), + expected: &Config{ + Path: "./group_by/*.json", + FlushInterval: time.Second, + FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: defaultMaxOpenFiles, + ResourceAttribute: defaultResourceAttribute, + }, + }, + }, + { + id: component.NewIDWithName(metadata.Type, "group_by_invalid_path"), + errorMessage: "path must contain exatcly one * when group_by is enabled", + }, + { + id: component.NewIDWithName(metadata.Type, "group_by_invalid_path2"), + errorMessage: "path must not start with * when group_by is enabled", + }, + { + id: component.NewIDWithName(metadata.Type, "group_by_empty_resource_attribute"), + errorMessage: "resource_attribute must not be empty when group_by is enabled", + }, } for _, tt := range tests { diff --git a/exporter/fileexporter/encoding_test.go b/exporter/fileexporter/encoding_test.go new file mode 100644 index 000000000000..fbcf35415879 --- /dev/null +++ b/exporter/fileexporter/encoding_test.go @@ -0,0 +1,120 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package fileexporter + +import ( + "context" + "os" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/extension/extensiontest" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" + + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension" +) + +type hostWithEncoding struct { + encodings map[component.ID]component.Component +} + +func (h hostWithEncoding) GetFactory(_ component.Kind, _ component.Type) component.Factory { + panic("unsupported") +} + +func (h hostWithEncoding) GetExtensions() map[component.ID]component.Component { + return h.encodings +} + +func (h hostWithEncoding) GetExporters() map[component.DataType]map[component.ID]component.Component { + panic("unsupported") +} + +func TestEncoding(t *testing.T) { + f := NewFactory() + cfg := f.CreateDefaultConfig().(*Config) + cfg.Path = filepath.Join(t.TempDir(), "encoding.txt") + id := component.MustNewID("otlpjson") + cfg.Encoding = &id + + ef := otlpencodingextension.NewFactory() + efCfg := ef.CreateDefaultConfig().(*otlpencodingextension.Config) + efCfg.Protocol = "otlp_json" + ext, err := ef.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), efCfg) + require.NoError(t, err) + require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost())) + + me, err := f.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + te, err := f.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + le, err := f.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := hostWithEncoding{ + map[component.ID]component.Component{id: ext}, + } + require.NoError(t, me.Start(context.Background(), host)) + require.NoError(t, te.Start(context.Background(), host)) + require.NoError(t, le.Start(context.Background(), host)) + t.Cleanup(func() { + + }) + + require.NoError(t, me.ConsumeMetrics(context.Background(), generateMetrics())) + require.NoError(t, te.ConsumeTraces(context.Background(), generateTraces())) + require.NoError(t, le.ConsumeLogs(context.Background(), generateLogs())) + + require.NoError(t, me.Shutdown(context.Background())) + require.NoError(t, te.Shutdown(context.Background())) + require.NoError(t, le.Shutdown(context.Background())) + + b, err := os.ReadFile(cfg.Path) + require.NoError(t, err) + require.Contains(t, string(b), `{"resourceMetrics":`) + require.Contains(t, string(b), `{"resourceSpans":`) + require.Contains(t, string(b), `{"resourceLogs":`) +} + +func generateLogs() plog.Logs { + logs := plog.NewLogs() + rl := logs.ResourceLogs().AppendEmpty() + rl.Resource().Attributes().PutStr("resource", "R1") + l := rl.ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + l.Body().SetStr("test log message") + l.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return logs +} + +func generateMetrics() pmetric.Metrics { + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("resource", "R1") + m := rm.ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + m.SetName("test_metric") + dp := m.SetEmptyGauge().DataPoints().AppendEmpty() + dp.Attributes().PutStr("test_attr", "value_1") + dp.SetIntValue(123) + dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return metrics +} + +func generateTraces() ptrace.Traces { + traces := ptrace.NewTraces() + rs := traces.ResourceSpans().AppendEmpty() + rs.Resource().Attributes().PutStr("resource", "R1") + span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty() + span.Attributes().PutStr("test_attr", "value_1") + span.SetName("test_span") + span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(-1 * time.Second))) + span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return traces +} diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index b75a0c0eb528..6c05220697bf 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/zap" "gopkg.in/natefinch/lumberjack.v2" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter/internal/metadata" @@ -32,6 +33,10 @@ const ( // the type of compression codec compressionZSTD = "zstd" + + defaultMaxOpenFiles = 100 + + defaultResourceAttribute = "fileexporter.path_segment" ) type FileExporter interface { @@ -55,6 +60,10 @@ func createDefaultConfig() component.Config { return &Config{ FormatType: formatTypeJSON, Rotation: &Rotation{MaxBackups: defaultMaxBackups}, + GroupBy: &GroupBy{ + ResourceAttribute: defaultResourceAttribute, + MaxOpenFiles: defaultMaxOpenFiles, + }, } } @@ -63,7 +72,7 @@ func createTracesExporter( set exporter.CreateSettings, cfg component.Config, ) (exporter.Traces, error) { - fe := getOrCreateFileExporter(cfg) + fe := getOrCreateFileExporter(cfg, set.Logger) return exporterhelper.NewTracesExporter( ctx, set, @@ -80,7 +89,7 @@ func createMetricsExporter( set exporter.CreateSettings, cfg component.Config, ) (exporter.Metrics, error) { - fe := getOrCreateFileExporter(cfg) + fe := getOrCreateFileExporter(cfg, set.Logger) return exporterhelper.NewMetricsExporter( ctx, set, @@ -97,7 +106,7 @@ func createLogsExporter( set exporter.CreateSettings, cfg component.Config, ) (exporter.Logs, error) { - fe := getOrCreateFileExporter(cfg) + fe := getOrCreateFileExporter(cfg, set.Logger) return exporterhelper.NewLogsExporter( ctx, set, @@ -113,26 +122,40 @@ func createLogsExporter( // or returns the already cached one. Caching is required because the factory is asked trace and // metric receivers separately when it gets CreateTracesReceiver() and CreateMetricsReceiver() // but they must not create separate objects, they must use one Exporter object per configuration. -func getOrCreateFileExporter(cfg component.Config) FileExporter { +func getOrCreateFileExporter(cfg component.Config, logger *zap.Logger) FileExporter { conf := cfg.(*Config) fe := exporters.GetOrAdd(cfg, func() component.Component { - return newFileExporter(conf) + return newFileExporter(conf, logger) }) c := fe.Unwrap() return c.(FileExporter) } -func newFileExporter(conf *Config) FileExporter { - return &fileExporter{ - conf: conf, +func newFileExporter(conf *Config, logger *zap.Logger) FileExporter { + if conf.GroupBy == nil || !conf.GroupBy.Enabled { + return &fileExporter{ + conf: conf, + } } + + return &groupingFileExporter{ + conf: conf, + logger: logger, + } + } -func newFileWriter(path string, rotation *Rotation, flushInterval time.Duration, export exportFunc) (*fileWriter, error) { +func newFileWriter(path string, shouldAppend bool, rotation *Rotation, flushInterval time.Duration, export exportFunc) (*fileWriter, error) { var wc io.WriteCloser if rotation == nil { - f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) + fileFlags := os.O_RDWR | os.O_CREATE + if shouldAppend { + fileFlags |= os.O_APPEND + } else { + fileFlags |= os.O_TRUNC + } + f, err := os.OpenFile(path, fileFlags, 0644) if err != nil { return nil, err } diff --git a/exporter/fileexporter/factory_test.go b/exporter/fileexporter/factory_test.go index 1f8a99c79163..950bd4cce82c 100644 --- a/exporter/fileexporter/factory_test.go +++ b/exporter/fileexporter/factory_test.go @@ -168,7 +168,7 @@ func TestNewFileWriter(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := newFileWriter(tt.args.cfg.Path, tt.args.cfg.Rotation, tt.args.cfg.FlushInterval, nil) + got, err := newFileWriter(tt.args.cfg.Path, tt.args.cfg.Append, tt.args.cfg.Rotation, tt.args.cfg.FlushInterval, nil) defer func() { assert.NoError(t, got.file.Close()) }() diff --git a/exporter/fileexporter/file_exporter.go b/exporter/fileexporter/file_exporter.go index 18cf7aa58637..c7a090f28c6c 100644 --- a/exporter/fileexporter/file_exporter.go +++ b/exporter/fileexporter/file_exporter.go @@ -44,19 +44,15 @@ func (e *fileExporter) consumeLogs(_ context.Context, ld plog.Logs) error { } // Start starts the flush timer if set. -func (e *fileExporter) Start(_ context.Context, _ component.Host) error { - e.marshaller = &marshaller{ - formatType: e.conf.FormatType, - tracesMarshaler: tracesMarshalers[e.conf.FormatType], - metricsMarshaler: metricsMarshalers[e.conf.FormatType], - logsMarshaler: logsMarshalers[e.conf.FormatType], - compression: e.conf.Compression, - compressor: buildCompressor(e.conf.Compression), +func (e *fileExporter) Start(_ context.Context, host component.Host) error { + var err error + e.marshaller, err = newMarshaller(e.conf, host) + if err != nil { + return err } export := buildExportFunc(e.conf) - var err error - e.writer, err = newFileWriter(e.conf.Path, e.conf.Rotation, e.conf.FlushInterval, export) + e.writer, err = newFileWriter(e.conf.Path, e.conf.Append, e.conf.Rotation, e.conf.FlushInterval, export) if err != nil { return err } diff --git a/exporter/fileexporter/file_exporter_test.go b/exporter/fileexporter/file_exporter_test.go index 5cff81001f62..cefc5747f775 100644 --- a/exporter/fileexporter/file_exporter_test.go +++ b/exporter/fileexporter/file_exporter_test.go @@ -11,6 +11,7 @@ import ( "io" "os" "path/filepath" + "slices" "sync" "testing" "time" @@ -22,6 +23,7 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/zap" "gopkg.in/natefinch/lumberjack.v2" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" @@ -126,7 +128,7 @@ func TestFileTracesExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { conf := tt.args.conf - feI := newFileExporter(conf) + feI := newFileExporter(conf, zap.NewNop()) require.IsType(t, &fileExporter{}, feI) fe := feI.(*fileExporter) @@ -632,7 +634,7 @@ func TestFlushing(t *testing.T) { // Wrap the buffer with the buffered writer closer that implements flush() method. bwc := newBufferedWriteCloser(buf) // Create a file exporter with flushing enabled. - feI := newFileExporter(cfg) + feI := newFileExporter(cfg, zap.NewNop()) assert.IsType(t, &fileExporter{}, feI) fe := feI.(*fileExporter) @@ -648,7 +650,7 @@ func TestFlushing(t *testing.T) { } export := buildExportFunc(fe.conf) var err error - fe.writer, err = newFileWriter(fe.conf.Path, fe.conf.Rotation, fe.conf.FlushInterval, export) + fe.writer, err = newFileWriter(fe.conf.Path, fe.conf.Append, fe.conf.Rotation, fe.conf.FlushInterval, export) assert.NoError(t, err) err = fe.writer.file.Close() assert.NoError(t, err) @@ -673,3 +675,86 @@ func TestFlushing(t *testing.T) { assert.EqualValues(t, b, bbuf.Bytes()) assert.NoError(t, fe.Shutdown(ctx)) } + +func TestAppend(t *testing.T) { + cfg := &Config{ + Path: tempFileName(t), + FlushInterval: time.Second, + Append: true, + } + + // Create a buffer to capture the output. + bbuf := &tsBuffer{b: &bytes.Buffer{}} + buf := &NopWriteCloser{bbuf} + // Wrap the buffer with the buffered writer closer that implements flush() method. + bwc := newBufferedWriteCloser(buf) + // Create a file exporter with flushing enabled. + feI := newFileExporter(cfg, zap.NewNop()) + assert.IsType(t, &fileExporter{}, feI) + fe := feI.(*fileExporter) + + // Start the flusher. + ctx := context.Background() + fe.marshaller = &marshaller{ + formatType: fe.conf.FormatType, + tracesMarshaler: tracesMarshalers[fe.conf.FormatType], + metricsMarshaler: metricsMarshalers[fe.conf.FormatType], + logsMarshaler: logsMarshalers[fe.conf.FormatType], + compression: fe.conf.Compression, + compressor: buildCompressor(fe.conf.Compression), + } + export := buildExportFunc(fe.conf) + var err error + fe.writer, err = newFileWriter(fe.conf.Path, fe.conf.Append, fe.conf.Rotation, fe.conf.FlushInterval, export) + assert.NoError(t, err) + err = fe.writer.file.Close() + assert.NoError(t, err) + fe.writer.file = bwc + fe.writer.start() + + // Write 10 bytes. + b1 := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10} + i, err := safeFileExporterWrite(fe, b1) + assert.NoError(t, err) + assert.EqualValues(t, len(b1), i, "bytes written") + + // Assert buf contains 0 bytes before flush is called. + assert.EqualValues(t, 0, bbuf.Len(), "before flush") + + // Wait 1.5 sec + time.Sleep(1500 * time.Millisecond) + + // Assert buf contains 10 bytes after flush is called. + assert.EqualValues(t, 10, bbuf.Len(), "after flush") + // Compare the content. + assert.EqualValues(t, b1, bbuf.Bytes()) + assert.NoError(t, fe.Shutdown(ctx)) + + // Restart the exporter + fe.writer, err = newFileWriter(fe.conf.Path, fe.conf.Append, fe.conf.Rotation, fe.conf.FlushInterval, export) + assert.NoError(t, err) + err = fe.writer.file.Close() + assert.NoError(t, err) + fe.writer.file = bwc + fe.writer.start() + + // Write 10 bytes - again + b2 := []byte{11, 12, 13, 14, 15, 16, 17, 18, 19, 20} + i, err = safeFileExporterWrite(fe, b2) + assert.NoError(t, err) + assert.EqualValues(t, len(b2), i, "bytes written") + + // Assert buf contains 10 bytes before flush is called. + assert.EqualValues(t, 10, bbuf.Len(), "after restart - before flush") + + // Wait 1.5 sec + time.Sleep(1500 * time.Millisecond) + + // Assert buf contains 20 bytes after flush is called. + assert.EqualValues(t, 20, bbuf.Len(), "after restart - after flush") + // Compare the content. + bComplete := slices.Clone(b1) + bComplete = append(bComplete, b2...) + assert.EqualValues(t, bComplete, bbuf.Bytes()) + assert.NoError(t, fe.Shutdown(ctx)) +} diff --git a/exporter/fileexporter/generated_component_test.go b/exporter/fileexporter/generated_component_test.go index 01de9d0396be..338d3e841ea2 100644 --- a/exporter/fileexporter/generated_component_test.go +++ b/exporter/fileexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 8c48ac7e61b8..9311f978264a 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -3,18 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileex go 1.21 require ( + github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/klauspost/compress v1.17.7 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 + go.uber.org/zap v1.27.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) @@ -22,12 +26,13 @@ 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -36,27 +41,26 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -76,3 +80,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/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 + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../../extension/encoding diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index c159bafde06d..0221e549ded4 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -5,8 +5,9 @@ github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY 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.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/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/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= @@ -23,6 +24,10 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/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= @@ -48,8 +53,9 @@ 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= @@ -66,26 +72,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6 h1:BzuuN5Oo7knT4areFJxslVWfSpXAgtovd2KzxcVIjUQ= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240306115632-b2693620eff6/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -137,8 +143,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/fileexporter/grouping_file_exporter.go b/exporter/fileexporter/grouping_file_exporter.go new file mode 100644 index 000000000000..329c61878577 --- /dev/null +++ b/exporter/fileexporter/grouping_file_exporter.go @@ -0,0 +1,289 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package fileexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" + +import ( + "context" + "errors" + "fmt" + "os" + "path" + "strings" + "sync" + + "github.com/hashicorp/golang-lru/v2/simplelru" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/zap" +) + +type groupingFileExporter struct { + conf *Config + logger *zap.Logger + marshaller *marshaller + pathPrefix string + pathSuffix string + attribute string + maxOpenFiles int + newFileWriter func(path string) (*fileWriter, error) + + mutex sync.Mutex + writers *simplelru.LRU[string, *fileWriter] +} + +func (e *groupingFileExporter) consumeTraces(ctx context.Context, td ptrace.Traces) error { + if td.ResourceSpans().Len() == 0 { + return nil + } + + groups := make(map[string][]ptrace.ResourceSpans) + + for i := 0; i < td.ResourceSpans().Len(); i++ { + rSpans := td.ResourceSpans().At(i) + group(e, groups, rSpans.Resource(), rSpans) + } + + var errs error + for pathSegment, rSpansSlice := range groups { + traces := ptrace.NewTraces() + for _, rSpans := range rSpansSlice { + rSpans.CopyTo(traces.ResourceSpans().AppendEmpty()) + } + + buf, err := e.marshaller.marshalTraces(traces) + if err != nil { + errs = errors.Join(errs, err) + continue + } + + err = e.write(ctx, pathSegment, buf) + if err != nil { + errs = errors.Join(errs, err) + } + } + + if errs != nil { + return consumererror.NewPermanent(errs) + } + + return nil +} + +func (e *groupingFileExporter) consumeMetrics(ctx context.Context, md pmetric.Metrics) error { + if md.ResourceMetrics().Len() == 0 { + return nil + } + + groups := make(map[string][]pmetric.ResourceMetrics) + + for i := 0; i < md.ResourceMetrics().Len(); i++ { + rMetrics := md.ResourceMetrics().At(i) + group(e, groups, rMetrics.Resource(), rMetrics) + } + + var errs error + for pathSegment, rMetricsSlice := range groups { + metrics := pmetric.NewMetrics() + for _, rMetrics := range rMetricsSlice { + rMetrics.CopyTo(metrics.ResourceMetrics().AppendEmpty()) + } + + buf, err := e.marshaller.marshalMetrics(metrics) + if err != nil { + errs = errors.Join(errs, err) + continue + } + + err = e.write(ctx, pathSegment, buf) + if err != nil { + errs = errors.Join(errs, err) + } + } + + if errs != nil { + return consumererror.NewPermanent(errs) + } + + return nil +} + +func (e *groupingFileExporter) consumeLogs(ctx context.Context, ld plog.Logs) error { + if ld.ResourceLogs().Len() == 0 { + return nil + } + + groups := make(map[string][]plog.ResourceLogs) + + for i := 0; i < ld.ResourceLogs().Len(); i++ { + rLogs := ld.ResourceLogs().At(i) + group(e, groups, rLogs.Resource(), rLogs) + } + + var errs error + for pathSegment, rLogsSlice := range groups { + logs := plog.NewLogs() + for _, rlogs := range rLogsSlice { + rlogs.CopyTo(logs.ResourceLogs().AppendEmpty()) + } + + buf, err := e.marshaller.marshalLogs(logs) + if err != nil { + errs = errors.Join(errs, err) + continue + } + + err = e.write(ctx, pathSegment, buf) + if err != nil { + errs = errors.Join(errs, err) + } + } + + if errs != nil { + return consumererror.NewPermanent(errs) + } + + return nil +} + +func (e *groupingFileExporter) write(_ context.Context, pathSegment string, buf []byte) error { + writer, err := e.getWriter(pathSegment) + if err != nil { + return err + } + + err = writer.export(buf) + if err != nil { + return err + } + + return nil +} + +func (e *groupingFileExporter) getWriter(pathSegment string) (*fileWriter, error) { + fullPath := e.fullPath(pathSegment) + + e.mutex.Lock() + defer e.mutex.Unlock() + + writer, ok := e.writers.Get(fullPath) + if ok { + return writer, nil + } + + err := os.MkdirAll(path.Dir(fullPath), 0755) + if err != nil { + return nil, err + } + + writer, err = e.newFileWriter(fullPath) + if err != nil { + return nil, err + } + + e.writers.Add(fullPath, writer) + + writer.start() + + return writer, nil +} + +func cleanPathPrefix(pathPrefix string) string { + cleaned := path.Clean(pathPrefix) + if strings.HasSuffix(pathPrefix, "/") && !strings.HasSuffix(cleaned, "/") { + return cleaned + "/" + } + + return cleaned +} + +func (e *groupingFileExporter) fullPath(pathSegment string) string { + if strings.HasPrefix(pathSegment, "./") { + pathSegment = pathSegment[1:] + } else if strings.HasPrefix(pathSegment, "../") { + pathSegment = pathSegment[2:] + } + + fullPath := path.Clean(e.pathPrefix + pathSegment + e.pathSuffix) + if strings.HasPrefix(fullPath, e.pathPrefix) { + return fullPath + } + + // avoid path traversal vulnerability + return path.Join(e.pathPrefix, path.Join("/", pathSegment+e.pathSuffix)) +} + +func (e *groupingFileExporter) onEvict(_ string, writer *fileWriter) { + err := writer.shutdown() + if err != nil { + e.logger.Warn("Failed to close file", zap.Error(err), zap.String("path", writer.path)) + } +} + +func group[T any](e *groupingFileExporter, groups map[string][]T, resource pcommon.Resource, resourceEntries T) { + var pathSegment string + v, ok := resource.Attributes().Get(e.attribute) + if ok { + if v.Type() == pcommon.ValueTypeStr { + pathSegment = v.Str() + } else { + ok = false + } + } + + if !ok { + e.logger.Debug(fmt.Sprintf("Resource does not contain %s attribute, dropping it", e.attribute)) + return + } + + groups[pathSegment] = append(groups[pathSegment], resourceEntries) +} + +// Start initializes and starts the exporter. +func (e *groupingFileExporter) Start(_ context.Context, host component.Host) error { + var err error + e.marshaller, err = newMarshaller(e.conf, host) + if err != nil { + return err + } + export := buildExportFunc(e.conf) + + pathParts := strings.Split(e.conf.Path, "*") + + e.pathPrefix = cleanPathPrefix(pathParts[0]) + e.attribute = e.conf.GroupBy.ResourceAttribute + e.pathSuffix = pathParts[1] + e.maxOpenFiles = e.conf.GroupBy.MaxOpenFiles + e.newFileWriter = func(path string) (*fileWriter, error) { + return newFileWriter(path, e.conf.Append, nil, e.conf.FlushInterval, export) + } + + writers, err := simplelru.NewLRU(e.conf.GroupBy.MaxOpenFiles, e.onEvict) + if err != nil { + return err + } + + e.writers = writers + + return nil +} + +// Shutdown stops the exporter and is invoked during shutdown. +// It stops flushes and closes all underlying writers. +func (e *groupingFileExporter) Shutdown(context.Context) error { + e.mutex.Lock() + defer e.mutex.Unlock() + + if e.writers == nil { + return nil + } + + e.writers.Purge() + e.writers = nil + + return nil +} diff --git a/exporter/fileexporter/grouping_file_exporter_test.go b/exporter/fileexporter/grouping_file_exporter_test.go new file mode 100644 index 000000000000..53f1b06a7382 --- /dev/null +++ b/exporter/fileexporter/grouping_file_exporter_test.go @@ -0,0 +1,499 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 +package fileexporter + +import ( + "bufio" + "bytes" + "context" + "fmt" + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" +) + +type testMarshaller struct { + content []byte +} + +func (m *testMarshaller) MarshalTraces(ptrace.Traces) ([]byte, error) { + return m.content, nil +} + +func (m *testMarshaller) MarshalLogs(plog.Logs) ([]byte, error) { + return m.content, nil +} + +func (m *testMarshaller) MarshalMetrics(pmetric.Metrics) ([]byte, error) { + return m.content, nil +} + +type groupingExporterTestCase struct { + name string + conf *Config + traceUnmarshaler ptrace.Unmarshaler + logUnmarshaler plog.Unmarshaler + metricUnmarshaler pmetric.Unmarshaler +} + +func groupingExporterTestCases() []groupingExporterTestCase { + return []groupingExporterTestCase{ + { + name: "json: default configuration", + conf: &Config{ + FormatType: formatTypeJSON, + Rotation: &Rotation{MaxBackups: defaultMaxBackups}, + GroupBy: &GroupBy{ + Enabled: true, + // defaults: + ResourceAttribute: defaultResourceAttribute, + MaxOpenFiles: defaultMaxOpenFiles, + }, + }, + traceUnmarshaler: &ptrace.JSONUnmarshaler{}, + logUnmarshaler: &plog.JSONUnmarshaler{}, + metricUnmarshaler: &pmetric.JSONUnmarshaler{}, + }, + { + name: "json: compression configuration", + conf: &Config{ + FormatType: formatTypeJSON, + Compression: compressionZSTD, + Rotation: &Rotation{MaxBackups: defaultMaxBackups}, + GroupBy: &GroupBy{ + Enabled: true, + // defaults: + ResourceAttribute: defaultResourceAttribute, + MaxOpenFiles: defaultMaxOpenFiles, + }, + }, + traceUnmarshaler: &ptrace.JSONUnmarshaler{}, + logUnmarshaler: &plog.JSONUnmarshaler{}, + metricUnmarshaler: &pmetric.JSONUnmarshaler{}, + }, + { + name: "Proto: default configuration", + conf: &Config{ + FormatType: formatTypeProto, + GroupBy: &GroupBy{ + Enabled: true, + // defaults: + ResourceAttribute: defaultResourceAttribute, + MaxOpenFiles: defaultMaxOpenFiles, + }, + }, + traceUnmarshaler: &ptrace.ProtoUnmarshaler{}, + logUnmarshaler: &plog.ProtoUnmarshaler{}, + metricUnmarshaler: &pmetric.ProtoUnmarshaler{}, + }, + { + name: "Proto: compression configuration", + conf: &Config{ + FormatType: formatTypeProto, + Compression: compressionZSTD, + Rotation: &Rotation{MaxBackups: defaultMaxBackups}, + GroupBy: &GroupBy{ + Enabled: true, + // defaults: + ResourceAttribute: defaultResourceAttribute, + MaxOpenFiles: defaultMaxOpenFiles, + }, + }, + traceUnmarshaler: &ptrace.ProtoUnmarshaler{}, + logUnmarshaler: &plog.ProtoUnmarshaler{}, + metricUnmarshaler: &pmetric.ProtoUnmarshaler{}, + }, + { + name: "json: max_open_files=1", + conf: &Config{ + FormatType: formatTypeJSON, + Rotation: &Rotation{MaxBackups: defaultMaxBackups}, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: 1, + // defaults: + ResourceAttribute: defaultResourceAttribute, + }, + }, + traceUnmarshaler: &ptrace.JSONUnmarshaler{}, + logUnmarshaler: &plog.JSONUnmarshaler{}, + metricUnmarshaler: &pmetric.JSONUnmarshaler{}, + }, + } +} + +func TestGroupingFileTracesExporter(t *testing.T) { + for _, tt := range groupingExporterTestCases() { + t.Run(tt.name, func(t *testing.T) { + conf := tt.conf + tmpDir := t.TempDir() + conf.Path = tmpDir + "/*.log" + zapCore, logs := observer.New(zap.DebugLevel) + feI := newFileExporter(conf, zap.New(zapCore)) + require.IsType(t, &groupingFileExporter{}, feI) + gfe := feI.(*groupingFileExporter) + + testSpans := func() ptrace.Traces { + td := testdata.GenerateTracesTwoSpansSameResourceOneDifferent() + testdata.GenerateTracesOneSpan().ResourceSpans().At(0).CopyTo(td.ResourceSpans().AppendEmpty()) + td.ResourceSpans().At(0).Resource().Attributes().PutStr("fileexporter.path_segment", "one") + td.ResourceSpans().At(1).Resource().Attributes().PutStr("fileexporter.path_segment", ".././two/two") + return td + } + td := testSpans() + + assert.NoError(t, gfe.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, gfe.consumeTraces(context.Background(), td)) + assert.LessOrEqual(t, gfe.writers.Len(), conf.GroupBy.MaxOpenFiles) + + assert.NoError(t, gfe.Shutdown(context.Background())) + + // make sure the exporter did not modify any data + assert.Equal(t, testSpans(), td) + + debugLogs := logs.FilterLevelExact(zap.DebugLevel) + assert.Equal(t, 1, debugLogs.Len()) + assert.Equal(t, 0, logs.Len()-debugLogs.Len()) + + pathResourceSpans := map[string][]ptrace.ResourceSpans{ + tmpDir + "/one.log": {td.ResourceSpans().At(0)}, + tmpDir + "/two/two.log": {td.ResourceSpans().At(1)}, + } + + for path, wantResourceSpans := range pathResourceSpans { + fi, err := os.Open(path) + if len(wantResourceSpans) == 0 { + assert.Error(t, err) + continue + } + assert.NoError(t, err) + br := bufio.NewReader(fi) + for { + buf, isEnd, err := func() ([]byte, bool, error) { + if gfe.marshaller.formatType == formatTypeJSON && gfe.marshaller.compression == "" { + return readJSONMessage(br) + } + return readMessageFromStream(br) + }() + assert.NoError(t, err) + if isEnd { + break + } + decoder := buildUnCompressor(gfe.marshaller.compression) + buf, err = decoder(buf) + assert.NoError(t, err) + got, err := tt.traceUnmarshaler.UnmarshalTraces(buf) + assert.NoError(t, err) + + gotResourceSpans := make([]ptrace.ResourceSpans, 0) + for i := 0; i < got.ResourceSpans().Len(); i++ { + gotResourceSpans = append(gotResourceSpans, got.ResourceSpans().At(i)) + } + + assert.EqualValues(t, wantResourceSpans, gotResourceSpans) + } + fi.Close() + } + }) + } +} + +func TestGroupingFileLogsExporter(t *testing.T) { + for _, tt := range groupingExporterTestCases() { + t.Run(tt.name, func(t *testing.T) { + conf := tt.conf + tmpDir := t.TempDir() + conf.Path = tmpDir + "/*.log" + zapCore, logs := observer.New(zap.DebugLevel) + feI := newFileExporter(conf, zap.New(zapCore)) + require.IsType(t, &groupingFileExporter{}, feI) + gfe := feI.(*groupingFileExporter) + + testLogs := func() plog.Logs { + td := testdata.GenerateLogsTwoLogRecordsSameResource() + testdata.GenerateLogsOneLogRecord().ResourceLogs().At(0).CopyTo(td.ResourceLogs().AppendEmpty()) + testdata.GenerateLogsOneLogRecord().ResourceLogs().At(0).CopyTo(td.ResourceLogs().AppendEmpty()) + td.ResourceLogs().At(0).Resource().Attributes().PutStr("fileexporter.path_segment", "one") + td.ResourceLogs().At(1).Resource().Attributes().PutStr("fileexporter.path_segment", ".././two/two") + return td + } + td := testLogs() + + assert.NoError(t, gfe.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, gfe.consumeLogs(context.Background(), td)) + assert.LessOrEqual(t, gfe.writers.Len(), conf.GroupBy.MaxOpenFiles) + + assert.NoError(t, gfe.Shutdown(context.Background())) + + // make sure the exporter did not modify any data + assert.Equal(t, testLogs(), td) + + debugLogs := logs.FilterLevelExact(zap.DebugLevel) + assert.Equal(t, 1, debugLogs.Len()) + assert.Equal(t, 0, logs.Len()-debugLogs.Len()) + + pathResourceLogs := map[string][]plog.ResourceLogs{ + tmpDir + "/one.log": {td.ResourceLogs().At(0)}, + tmpDir + "/two/two.log": {td.ResourceLogs().At(1)}, + } + + for path, wantResourceLogs := range pathResourceLogs { + fi, err := os.Open(path) + if len(wantResourceLogs) == 0 { + assert.Error(t, err) + continue + } + assert.NoError(t, err) + br := bufio.NewReader(fi) + for { + buf, isEnd, err := func() ([]byte, bool, error) { + if gfe.marshaller.formatType == formatTypeJSON && gfe.marshaller.compression == "" { + return readJSONMessage(br) + } + return readMessageFromStream(br) + }() + assert.NoError(t, err) + if isEnd { + break + } + decoder := buildUnCompressor(gfe.marshaller.compression) + buf, err = decoder(buf) + assert.NoError(t, err) + got, err := tt.logUnmarshaler.UnmarshalLogs(buf) + assert.NoError(t, err) + + gotResourceLogs := make([]plog.ResourceLogs, 0) + for i := 0; i < got.ResourceLogs().Len(); i++ { + gotResourceLogs = append(gotResourceLogs, got.ResourceLogs().At(i)) + } + + assert.EqualValues(t, wantResourceLogs, gotResourceLogs) + } + fi.Close() + } + }) + } +} + +func TestGroupingFileMetricsExporter(t *testing.T) { + for _, tt := range groupingExporterTestCases() { + t.Run(tt.name, func(t *testing.T) { + conf := tt.conf + tmpDir := t.TempDir() + conf.Path = tmpDir + "/*.log" + + zapCore, logs := observer.New(zap.DebugLevel) + feI := newFileExporter(conf, zap.New(zapCore)) + require.IsType(t, &groupingFileExporter{}, feI) + gfe := feI.(*groupingFileExporter) + + testMetrics := func() pmetric.Metrics { + td := testdata.GenerateMetricsTwoMetrics() + testdata.GenerateMetricsOneCounterOneSummaryMetrics().ResourceMetrics().At(0).CopyTo(td.ResourceMetrics().AppendEmpty()) + testdata.GenerateMetricsOneMetricNoAttributes().ResourceMetrics().At(0).CopyTo(td.ResourceMetrics().AppendEmpty()) + td.ResourceMetrics().At(0).Resource().Attributes().PutStr("fileexporter.path_segment", "one") + td.ResourceMetrics().At(1).Resource().Attributes().PutStr("fileexporter.path_segment", ".././two/two") + return td + } + td := testMetrics() + + assert.NoError(t, gfe.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, gfe.consumeMetrics(context.Background(), td)) + assert.LessOrEqual(t, gfe.writers.Len(), conf.GroupBy.MaxOpenFiles) + + assert.NoError(t, gfe.Shutdown(context.Background())) + + // make sure the exporter did not modify any data + assert.Equal(t, testMetrics(), td) + + debugLogs := logs.FilterLevelExact(zap.DebugLevel) + assert.Equal(t, 1, debugLogs.Len()) + assert.Equal(t, 0, logs.Len()-debugLogs.Len()) + + pathResourceMetrics := map[string][]pmetric.ResourceMetrics{ + tmpDir + "/one.log": {td.ResourceMetrics().At(0)}, + tmpDir + "/two/two.log": {td.ResourceMetrics().At(1)}, + } + + for path, wantResourceMetrics := range pathResourceMetrics { + fi, err := os.Open(path) + if len(wantResourceMetrics) == 0 { + assert.Error(t, err) + continue + } + assert.NoError(t, err) + br := bufio.NewReader(fi) + for { + buf, isEnd, err := func() ([]byte, bool, error) { + if gfe.marshaller.formatType == formatTypeJSON && gfe.marshaller.compression == "" { + return readJSONMessage(br) + } + return readMessageFromStream(br) + }() + assert.NoError(t, err) + if isEnd { + break + } + decoder := buildUnCompressor(gfe.marshaller.compression) + buf, err = decoder(buf) + assert.NoError(t, err) + got, err := tt.metricUnmarshaler.UnmarshalMetrics(buf) + assert.NoError(t, err) + + gotResourceMetrics := make([]pmetric.ResourceMetrics, 0) + for i := 0; i < got.ResourceMetrics().Len(); i++ { + gotResourceMetrics = append(gotResourceMetrics, got.ResourceMetrics().At(i)) + } + + assert.EqualValues(t, wantResourceMetrics, gotResourceMetrics) + } + fi.Close() + } + }) + } +} + +func TestFullPath(t *testing.T) { + tests := []struct { + prefix string + pathSegment string + suffix string + want string + }{ + // good actor + {prefix: "/", pathSegment: "filename", suffix: ".json", want: "/filename.json"}, + {prefix: "/", pathSegment: "/dir/filename", suffix: ".json", want: "/dir/filename.json"}, + {prefix: "/dir", pathSegment: "dirsuffix/filename", suffix: ".json", want: "/dirdirsuffix/filename.json"}, + {prefix: "/dir", pathSegment: "/subdir/filename", suffix: ".json", want: "/dir/subdir/filename.json"}, + {prefix: "/dir", pathSegment: "./filename", suffix: ".json", want: "/dir/filename.json"}, + {prefix: "/dir", pathSegment: "/subdir/", suffix: "filename.json", want: "/dir/subdir/filename.json"}, + {prefix: "/dir/", pathSegment: "subdir", suffix: "/filename.json", want: "/dir/subdir/filename.json"}, + {prefix: "/dir", pathSegment: "", suffix: "filename.json", want: "/dirfilename.json"}, + {prefix: "/dir/", pathSegment: "", suffix: "filename.json", want: "/dir/filename.json"}, + {prefix: "/dir/", pathSegment: "subdir/strangebutok/../", suffix: "filename.json", want: "/dir/subdir/filename.json"}, + {prefix: "/dir", pathSegment: "dirsuffix/strangebutok/../", suffix: "filename.json", want: "/dirdirsuffix/filename.json"}, + + // bad actor + {prefix: "/dir", pathSegment: "../etc/attack", suffix: ".json", want: "/dir/etc/attack.json"}, + {prefix: "/dir", pathSegment: "../etc/attack", suffix: "/filename.json", want: "/dir/etc/attack/filename.json"}, + {prefix: "/dir", pathSegment: "dirsuffix/../etc/attack", suffix: ".json", want: "/dir/etc/attack.json"}, + {prefix: "/dir", pathSegment: "dirsuffix/../../etc/attack", suffix: ".json", want: "/dir/etc/attack.json"}, + {prefix: "/dir", pathSegment: "dirsuffix/../../etc/attack", suffix: ".json", want: "/dir/etc/attack.json"}, + } + + for _, tc := range tests { + t.Run(fmt.Sprintf("%s + %s + %s", tc.prefix, tc.pathSegment, tc.suffix), func(t *testing.T) { + e := &groupingFileExporter{ + pathPrefix: cleanPathPrefix(tc.prefix), + pathSuffix: tc.suffix, + } + + assert.Equal(t, tc.want, e.fullPath(tc.pathSegment)) + }) + } +} + +func BenchmarkExporters(b *testing.B) { + tests := []struct { + name string + conf *Config + }{ + { + name: "default", + conf: &Config{ + Path: tempFileName(b), + FormatType: formatTypeJSON, + }, + }, + { + name: "grouping, 100 writers", + conf: &Config{ + Path: b.TempDir() + "/*", + FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: 100, + }, + }, + }, + { + name: "grouping, 99 writers", + conf: &Config{ + Path: b.TempDir() + "/*", + FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: 99, + }, + }, + }, + { + name: "grouping, 1 writer", + conf: &Config{ + Path: b.TempDir() + "/*", + FormatType: formatTypeJSON, + GroupBy: &GroupBy{ + Enabled: true, + MaxOpenFiles: 1, + }, + }, + }, + } + + var traces []ptrace.Traces + var logs []plog.Logs + for i := 0; i < 100; i++ { + td := testdata.GenerateTracesTwoSpansSameResource() + td.ResourceSpans().At(0).Resource().Attributes().PutStr("fileexporter.path_segment", fmt.Sprintf("file%d", i)) + traces = append(traces, td) + + ld := testdata.GenerateLogsTwoLogRecordsSameResource() + ld.ResourceLogs().At(0).Resource().Attributes().PutStr("fileexporter.path_segment", fmt.Sprintf("file%d", i)) + logs = append(logs, ld) + } + for _, tc := range tests { + fe := newFileExporter(tc.conf, zap.NewNop()) + + // remove marshaling time from the benchmark + tm := &testMarshaller{content: bytes.Repeat([]byte{'a'}, 512)} + marshaller := &marshaller{ + tracesMarshaler: tm, + metricsMarshaler: tm, + logsMarshaler: tm, + compression: "", + compressor: noneCompress, + formatType: "test", + } + switch fExp := fe.(type) { + case *fileExporter: + fExp.marshaller = marshaller + case *groupingFileExporter: + fExp.marshaller = marshaller + } + + require.NoError(b, fe.Start(context.Background(), componenttest.NewNopHost())) + + b.Run(tc.name, func(b *testing.B) { + b.ReportAllocs() + b.ResetTimer() + + ctx := context.Background() + for i := 0; i < b.N; i++ { + require.NoError(b, fe.consumeTraces(ctx, traces[i%len(traces)])) + require.NoError(b, fe.consumeLogs(ctx, logs[i%len(logs)])) + } + }) + + assert.NoError(b, fe.Shutdown(context.Background())) + } +} diff --git a/exporter/fileexporter/marshaller.go b/exporter/fileexporter/marshaller.go index 1eabb80369e4..9090640d8be7 100644 --- a/exporter/fileexporter/marshaller.go +++ b/exporter/fileexporter/marshaller.go @@ -4,6 +4,10 @@ package fileexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" import ( + "errors" + "fmt" + + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -34,7 +38,38 @@ type marshaller struct { formatType string } +func newMarshaller(conf *Config, host component.Host) (*marshaller, error) { + if conf.Encoding != nil { + encoding := host.GetExtensions()[*conf.Encoding] + if encoding == nil { + return nil, fmt.Errorf("unknown encoding %q", conf.Encoding) + } + // cast with ok to avoid panics. + tm, _ := encoding.(ptrace.Marshaler) + pm, _ := encoding.(pmetric.Marshaler) + lm, _ := encoding.(plog.Marshaler) + return &marshaller{ + tracesMarshaler: tm, + metricsMarshaler: pm, + logsMarshaler: lm, + compression: conf.Compression, + compressor: buildCompressor(conf.Compression), + }, nil + } + return &marshaller{ + formatType: conf.FormatType, + tracesMarshaler: tracesMarshalers[conf.FormatType], + metricsMarshaler: metricsMarshalers[conf.FormatType], + logsMarshaler: logsMarshalers[conf.FormatType], + compression: conf.Compression, + compressor: buildCompressor(conf.Compression), + }, nil +} + func (m *marshaller) marshalTraces(td ptrace.Traces) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("traces are not supported by encoding") + } buf, err := m.tracesMarshaler.MarshalTraces(td) if err != nil { return nil, err @@ -44,6 +79,9 @@ func (m *marshaller) marshalTraces(td ptrace.Traces) ([]byte, error) { } func (m *marshaller) marshalMetrics(md pmetric.Metrics) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("metrics are not supported by encoding") + } buf, err := m.metricsMarshaler.MarshalMetrics(md) if err != nil { return nil, err @@ -53,6 +91,9 @@ func (m *marshaller) marshalMetrics(md pmetric.Metrics) ([]byte, error) { } func (m *marshaller) marshalLogs(ld plog.Logs) ([]byte, error) { + if m.metricsMarshaler == nil { + return nil, errors.New("logs are not supported by encoding") + } buf, err := m.logsMarshaler.MarshalLogs(ld) if err != nil { return nil, err diff --git a/exporter/fileexporter/testdata/config.yaml b/exporter/fileexporter/testdata/config.yaml index cac55b48ae83..fd7b6445ad4f 100644 --- a/exporter/fileexporter/testdata/config.yaml +++ b/exporter/fileexporter/testdata/config.yaml @@ -55,3 +55,31 @@ file/flush_interval_500ms: file/flush_interval_negative_value: path: ./flushed flush_interval: "-1s" + +file/group_by: + path: ./group_by/*.json + group_by: + enabled: true + resource_attribute: dummy + max_open_files: 10 + +file/group_by_defaults: + path: ./group_by/*.json + group_by: + enabled: true + +file/group_by_invalid_path: + path: ./group_by_no_star + group_by: + enabled: true + +file/group_by_invalid_path2: + path: '*/./group_by' + group_by: + enabled: true + +file/group_by_empty_resource_attribute: + path: ./group_by/*.json + group_by: + enabled: true + resource_attribute: "" diff --git a/exporter/googlecloudexporter/README.md b/exporter/googlecloudexporter/README.md index 3eddd2f9dc28..d2197569162a 100644 --- a/exporter/googlecloudexporter/README.md +++ b/exporter/googlecloudexporter/README.md @@ -56,9 +56,9 @@ When running the Collector in a Docker container, a credentials file can be pass ``` docker run \ - --volume ~/service-account-key.json:/etc/otel/key.json \ - --volume $(pwd)/config.yaml:/etc/otel/config.yaml \ - --env GOOGLE_APPLICATION_CREDENTIALS=/etc/otel/key.json \ + --volume ~/service-account-key.json:/etc/otelcol-contrib/key.json \ + --volume $(pwd)/config.yaml:/etc/otelcol-contrib/config.yaml \ + --env GOOGLE_APPLICATION_CREDENTIALS=/etc/otelcol-contrib/key.json \ --expose 4317 \ --expose 55681 \ --rm \ diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 6a09e070d6e0..481c8ea7bb91 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -37,6 +37,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect @@ -59,14 +60,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // 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.24.0 // indirect @@ -88,7 +89,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index c56c49948f89..d83573fb1ddd 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -154,30 +154,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= @@ -292,8 +292,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index ca5f2dfbb586..1dda6b48a058 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,17 +6,17 @@ require ( cloud.google.com/go/pubsub v1.36.2 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.166.0 - google.golang.org/grpc v1.62.0 + google.golang.org/api v0.170.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -38,7 +38,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // 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 @@ -54,20 +54,20 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -75,7 +75,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 1923e135738b..aa1b0f328e6d 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -19,8 +19,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -28,8 +26,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -76,8 +72,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/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= @@ -130,30 +126,30 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -176,8 +172,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -196,11 +192,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -242,8 +238,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -255,15 +251,15 @@ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 1dacdca040b9..706759015ac1 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.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -60,7 +60,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 @@ -71,27 +71,27 @@ require ( github.com/tidwall/wal v1.1.7 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // 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 @@ -125,7 +125,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 483b6ad3b42c..dae7e8a24533 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -146,8 +146,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -183,58 +183,58 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f 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= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= @@ -334,7 +334,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -382,8 +382,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/honeycombmarkerexporter/generated_component_test.go b/exporter/honeycombmarkerexporter/generated_component_test.go index f1d77f7a1ee8..688be75d6f16 100644 --- a/exporter/honeycombmarkerexporter/generated_component_test.go +++ b/exporter/honeycombmarkerexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index 894913602aab..12b284987c37 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -54,17 +54,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -76,7 +76,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index 2c0c3005ccc0..82427438e8e5 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -92,42 +92,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -183,8 +183,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/influxdbexporter/generated_component_test.go b/exporter/influxdbexporter/generated_component_test.go index 68d79ff2a0d4..03b0dcab5a4f 100644 --- a/exporter/influxdbexporter/generated_component_test.go +++ b/exporter/influxdbexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index dc0921ee6b7e..10ad4dd8847a 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -8,14 +8,14 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,6 +36,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,17 +53,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -73,7 +74,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 969a9e2b761f..f5fbcd60e200 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -37,6 +37,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/influxdb-observability/common v0.5.8 h1:nyk4dqnKbPGIyr1vAs6oEsFQEHWi5jkSQ7PtP4v//lc= @@ -102,44 +104,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -195,8 +197,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/instanaexporter/config_test.go b/exporter/instanaexporter/config_test.go index fa05153942b6..207b2fe2daa9 100644 --- a/exporter/instanaexporter/config_test.go +++ b/exporter/instanaexporter/config_test.go @@ -29,8 +29,8 @@ func TestConfigValidate(t *testing.T) { t.Run("Valid configuration with ca_file", func(t *testing.T) { c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.crt", }, }, diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index d81a7711202f..6c7319e28ecf 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -84,8 +84,8 @@ func TestSelfSignedBackend(t *testing.T) { AgentKey: "key11", ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: caFile, }, }, @@ -110,8 +110,8 @@ func TestSelfSignedBackendCAFileNotFound(t *testing.T) { AgentKey: "key11", ClientConfig: confighttp.ClientConfig{ Endpoint: "", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca_file_not_found.pem", }, }, diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index 63643b76f855..4a9d867c9701 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -79,8 +79,8 @@ func TestLoadConfig(t *testing.T) { Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, WriteBufferSize: 512 * 1024, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.crt", }, }, diff --git a/exporter/instanaexporter/generated_component_test.go b/exporter/instanaexporter/generated_component_test.go index bbb5b6fab6c3..6de7f21420ad 100644 --- a/exporter/instanaexporter/generated_component_test.go +++ b/exporter/instanaexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 915e3f6f19f7..5d91a03a3c12 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index ecf7739d5419..c7f78eb1db14 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -167,8 +169,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 35ba89d41e15..e822b0a005f4 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -148,6 +148,7 @@ func (f *kafkaExporterFactory) createTracesExporter( exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), exporterhelper.WithRetry(oCfg.BackOffConfig), exporterhelper.WithQueue(oCfg.QueueSettings), + exporterhelper.WithStart(exp.start), exporterhelper.WithShutdown(exp.Close)) } @@ -178,6 +179,7 @@ func (f *kafkaExporterFactory) createMetricsExporter( exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), exporterhelper.WithRetry(oCfg.BackOffConfig), exporterhelper.WithQueue(oCfg.QueueSettings), + exporterhelper.WithStart(exp.start), exporterhelper.WithShutdown(exp.Close)) } @@ -208,5 +210,6 @@ func (f *kafkaExporterFactory) createLogsExporter( exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), exporterhelper.WithRetry(oCfg.BackOffConfig), exporterhelper.WithQueue(oCfg.QueueSettings), + exporterhelper.WithStart(exp.start), exporterhelper.WithShutdown(exp.Close)) } diff --git a/exporter/kafkaexporter/factory_test.go b/exporter/kafkaexporter/factory_test.go index 7f83a4c33857..6760029478df 100644 --- a/exporter/kafkaexporter/factory_test.go +++ b/exporter/kafkaexporter/factory_test.go @@ -11,6 +11,7 @@ import ( "github.com/IBM/sarama" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" @@ -124,9 +125,11 @@ func TestCreateMetricExporter(t *testing.T) { exportertest.NewNopCreateSettings(), tc.conf, ) + require.NoError(t, err) + assert.NotNil(t, exporter, "Must return valid exporter") + err = exporter.Start(context.Background(), componenttest.NewNopHost()) if tc.err != nil { assert.ErrorAs(t, err, &tc.err, "Must match the expected error") - assert.Nil(t, exporter, "Must return nil value for invalid exporter") return } assert.NoError(t, err, "Must not error") @@ -199,9 +202,11 @@ func TestCreateLogExporter(t *testing.T) { exportertest.NewNopCreateSettings(), tc.conf, ) + require.NoError(t, err) + assert.NotNil(t, exporter, "Must return valid exporter") + err = exporter.Start(context.Background(), componenttest.NewNopHost()) if tc.err != nil { assert.ErrorAs(t, err, &tc.err, "Must match the expected error") - assert.Nil(t, exporter, "Must return nil value for invalid exporter") return } assert.NoError(t, err, "Must not error") @@ -274,9 +279,11 @@ func TestCreateTraceExporter(t *testing.T) { exportertest.NewNopCreateSettings(), tc.conf, ) + require.NoError(t, err) + assert.NotNil(t, exporter, "Must return valid exporter") + err = exporter.Start(context.Background(), componenttest.NewNopHost()) if tc.err != nil { assert.ErrorAs(t, err, &tc.err, "Must match the expected error") - assert.Nil(t, exporter, "Must return nil value for invalid exporter") return } assert.NoError(t, err, "Must not error") diff --git a/exporter/kafkaexporter/generated_component_test.go b/exporter/kafkaexporter/generated_component_test.go new file mode 100644 index 000000000000..06bd42403b25 --- /dev/null +++ b/exporter/kafkaexporter/generated_component_test.go @@ -0,0 +1,101 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package kafkaexporter + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" +) + +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) + }) + } +} + +func generateLifecycleTestLogs() plog.Logs { + logs := plog.NewLogs() + rl := logs.ResourceLogs().AppendEmpty() + rl.Resource().Attributes().PutStr("resource", "R1") + l := rl.ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + l.Body().SetStr("test log message") + l.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return logs +} + +func generateLifecycleTestMetrics() pmetric.Metrics { + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("resource", "R1") + m := rm.ScopeMetrics().AppendEmpty().Metrics().AppendEmpty() + m.SetName("test_metric") + dp := m.SetEmptyGauge().DataPoints().AppendEmpty() + dp.Attributes().PutStr("test_attr", "value_1") + dp.SetIntValue(123) + dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return metrics +} + +func generateLifecycleTestTraces() ptrace.Traces { + traces := ptrace.NewTraces() + rs := traces.ResourceSpans().AppendEmpty() + rs.Resource().Attributes().PutStr("resource", "R1") + span := rs.ScopeSpans().AppendEmpty().Spans().AppendEmpty() + span.Attributes().PutStr("test_attr", "value_1") + span.SetName("test_span") + span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(-1 * time.Second))) + span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + return traces +} diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 938a14a36995..d1c8ea857387 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/IBM/sarama v1.43.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/gogo/protobuf v1.3.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.96.0 @@ -14,14 +14,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -44,6 +44,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -66,17 +67,17 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // 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 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -86,7 +87,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 26db7bdf20fd..73751ab879cc 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -42,6 +42,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -52,8 +54,8 @@ 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/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -106,8 +108,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= 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= @@ -133,32 +135,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -235,8 +237,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/kafkaexporter/kafka_exporter.go b/exporter/kafkaexporter/kafka_exporter.go index 47417f5ee4c9..c98abdc674c0 100644 --- a/exporter/kafkaexporter/kafka_exporter.go +++ b/exporter/kafkaexporter/kafka_exporter.go @@ -9,6 +9,7 @@ import ( "fmt" "github.com/IBM/sarama" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/plog" @@ -23,6 +24,7 @@ var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding") // kafkaTracesProducer uses sarama to produce trace messages to Kafka. type kafkaTracesProducer struct { + cfg Config producer sarama.SyncProducer topic string marshaler TracesMarshaler @@ -57,11 +59,24 @@ func (e *kafkaTracesProducer) tracesPusher(_ context.Context, td ptrace.Traces) } func (e *kafkaTracesProducer) Close(context.Context) error { + if e.producer == nil { + return nil + } return e.producer.Close() } +func (e *kafkaTracesProducer) start(_ context.Context, _ component.Host) error { + producer, err := newSaramaProducer(e.cfg) + if err != nil { + return err + } + e.producer = producer + return nil +} + // kafkaMetricsProducer uses sarama to produce metrics messages to kafka type kafkaMetricsProducer struct { + cfg Config producer sarama.SyncProducer topic string marshaler MetricsMarshaler @@ -87,11 +102,24 @@ func (e *kafkaMetricsProducer) metricsDataPusher(_ context.Context, md pmetric.M } func (e *kafkaMetricsProducer) Close(context.Context) error { + if e.producer == nil { + return nil + } return e.producer.Close() } +func (e *kafkaMetricsProducer) start(_ context.Context, _ component.Host) error { + producer, err := newSaramaProducer(e.cfg) + if err != nil { + return err + } + e.producer = producer + return nil +} + // kafkaLogsProducer uses sarama to produce logs messages to kafka type kafkaLogsProducer struct { + cfg Config producer sarama.SyncProducer topic string marshaler LogsMarshaler @@ -117,9 +145,21 @@ func (e *kafkaLogsProducer) logsDataPusher(_ context.Context, ld plog.Logs) erro } func (e *kafkaLogsProducer) Close(context.Context) error { + if e.producer == nil { + return nil + } return e.producer.Close() } +func (e *kafkaLogsProducer) start(_ context.Context, _ component.Host) error { + producer, err := newSaramaProducer(e.cfg) + if err != nil { + return err + } + e.producer = producer + return nil +} + func newSaramaProducer(config Config) (sarama.SyncProducer, error) { c := sarama.NewConfig() @@ -171,13 +211,8 @@ func newMetricsExporter(config Config, set exporter.CreateSettings, marshalers m if marshaler == nil { return nil, errUnrecognizedEncoding } - producer, err := newSaramaProducer(config) - if err != nil { - return nil, err - } - return &kafkaMetricsProducer{ - producer: producer, + cfg: config, topic: config.Topic, marshaler: marshaler, logger: set.Logger, @@ -196,12 +231,9 @@ func newTracesExporter(config Config, set exporter.CreateSettings, marshalers ma keyableMarshaler.Key() } } - producer, err := newSaramaProducer(config) - if err != nil { - return nil, err - } + return &kafkaTracesProducer{ - producer: producer, + cfg: config, topic: config.Topic, marshaler: marshaler, logger: set.Logger, @@ -213,13 +245,9 @@ func newLogsExporter(config Config, set exporter.CreateSettings, marshalers map[ if marshaler == nil { return nil, errUnrecognizedEncoding } - producer, err := newSaramaProducer(config) - if err != nil { - return nil, err - } return &kafkaLogsProducer{ - producer: producer, + cfg: config, topic: config.Topic, marshaler: marshaler, logger: set.Logger, diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index ab8956ca5e2c..7035bf186905 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -12,6 +12,7 @@ import ( "github.com/IBM/sarama/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/plog" @@ -26,8 +27,9 @@ import ( func TestNewExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) + require.NoError(t, err) + err = texp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) - assert.Nil(t, texp) } func TestNewExporter_err_encoding(t *testing.T) { @@ -40,8 +42,9 @@ func TestNewExporter_err_encoding(t *testing.T) { func TestNewMetricsExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) + require.NoError(t, err) + err = mexp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) - assert.Nil(t, mexp) } func TestNewMetricsExporter_err_encoding(t *testing.T) { @@ -60,9 +63,10 @@ func TestNewMetricsExporter_err_traces_encoding(t *testing.T) { func TestNewLogsExporter_err_version(t *testing.T) { c := Config{ProtocolVersion: "0.0.0", Encoding: defaultEncoding} - mexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) + lexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) + require.NoError(t, err) + err = lexp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) - assert.Nil(t, mexp) } func TestNewLogsExporter_err_encoding(t *testing.T) { @@ -83,8 +87,8 @@ func TestNewExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, @@ -98,17 +102,20 @@ func TestNewExporter_err_auth_type(t *testing.T) { }, } texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) + require.NoError(t, err) + err = texp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") - assert.Nil(t, texp) mexp, err := newMetricsExporter(c, exportertest.NewNopCreateSettings(), metricsMarshalers()) + require.NoError(t, err) + err = mexp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") - assert.Nil(t, mexp) lexp, err := newLogsExporter(c, exportertest.NewNopCreateSettings(), logsMarshalers()) + require.NoError(t, err) + err = lexp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") - assert.Nil(t, lexp) } @@ -120,9 +127,10 @@ func TestNewExporter_err_compression(t *testing.T) { }, } texp, err := newTracesExporter(c, exportertest.NewNopCreateSettings(), tracesMarshalers()) + require.NoError(t, err) + err = texp.start(context.Background(), componenttest.NewNopHost()) assert.Error(t, err) assert.Contains(t, err.Error(), "producer.compression should be one of 'none', 'gzip', 'snappy', 'lz4', or 'zstd'. configured value idk") - assert.Nil(t, texp) } func TestTracesPusher(t *testing.T) { diff --git a/exporter/kafkaexporter/metadata.yaml b/exporter/kafkaexporter/metadata.yaml index 7f5bad2c9b10..0aa2d33bc065 100644 --- a/exporter/kafkaexporter/metadata.yaml +++ b/exporter/kafkaexporter/metadata.yaml @@ -9,7 +9,6 @@ status: codeowners: active: [pavolloffay, MovieStoreGuy] -# TODO: Update the exporter to pass the tests tests: + config: skip_lifecycle: true - skip_shutdown: true diff --git a/exporter/kineticaexporter/go.mod b/exporter/kineticaexporter/go.mod index 626e2a33f1fa..353b869e0865 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.9.0 github.com/wk8/go-ordered-map/v2 v2.1.8 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -53,12 +53,12 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/ztrue/tracerr v0.3.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -68,7 +68,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/kineticaexporter/go.sum b/exporter/kineticaexporter/go.sum index 0f32999bc997..f9fdf51c4d79 100644 --- a/exporter/kineticaexporter/go.sum +++ b/exporter/kineticaexporter/go.sum @@ -94,28 +94,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -174,8 +174,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/loadbalancingexporter/README.md b/exporter/loadbalancingexporter/README.md index 0afc8f51048d..562a0ac97414 100644 --- a/exporter/loadbalancingexporter/README.md +++ b/exporter/loadbalancingexporter/README.md @@ -60,7 +60,7 @@ The `loadbalancingexporter` will, irrespective of the chosen resolver (`static`, Refer to [config.yaml](./testdata/config.yaml) for detailed examples on using the processor. * The `otlp` property configures the template used for building the OTLP exporter. Refer to the OTLP Exporter documentation for information on which options are available. Note that the `endpoint` property should not be set and will be overridden by this exporter with the backend endpoint. -* The `resolver` accepts a `static` node, a `dns` or a `k8s` service. If all three are specified, `k8s` takes precedence. +* The `resolver` accepts a `static` node, a `dns`, a `k8s` service or `awsCloudMap`. If all four are specified, an `errMultipleResolversProvided` error will be thrown. * The `hostname` property inside a `dns` node specifies the hostname to query in order to obtain the list of IP addresses. * The `dns` node also accepts the following optional properties: * `hostname` DNS hostname to resolve. @@ -70,6 +70,22 @@ Refer to [config.yaml](./testdata/config.yaml) for detailed examples on using th * The `k8s` node accepts the following optional properties: * `service` Kubernetes service to resolve, e.g. `lb-svc.lb-ns`. If no namespace is specified, an attempt will be made to infer the namespace for this collector, and if this fails it will fall back to the `default` namespace. * `ports` port to be used for exporting the traces to the addresses resolved from `service`. If `ports` is not specified, the default port 4317 is used. When multiple ports are specified, two backends are added to the load balancer as if they were at different pods. +* The `awsCloudMap` node accepts the following properties: + * `namespace` The CloudMap namespace where the service is register, e.g. `cloudmap`. If no `namespace` is specified, this will fail to start the Load Balancer exporter. + * `serviceName` The name of the service that you specified when you registered the instance, e.g. `otelcollectors`. If no `serviceName` is specified, this will fail to start the Load Balancer exporter. + * `interval` resolver interval in go-Duration format, e.g. `5s`, `1d`, `30m`. If not specified, `30s` will be used. + * `timeout` resolver timeout in go-Duration format, e.g. `5s`, `1d`, `30m`. If not specified, `5s` will be used. + * `port` port to be used for exporting the traces to the addresses resolved from `service`. By default, the port is set in Cloud Map, but can be be overridden with a static value in this config + * `healthStatus` filter in AWS Cloud Map, you can specify the health status of the instances that you want to discover. The healthStatus filter is optional and allows you to query based on the health status of the instances. + * Available values are + * `HEALTHY`: Only return instances that are healthy. + * `UNHEALTHY`: Only return instances that are unhealthy. + * `ALL`: Return all instances, regardless of their health status. + * `HEALTHY_OR_ELSE_ALL`: Returns healthy instances, unless none are reporting a healthy state. In that case, return all instances. This is also called failing open. + * Resolver's default filter is set to `HEALTHY` when none is explicitly defined + * **Notes:** + * This resolver currently returns a maximum of 100 hosts. + * `TODO`: Feature request [29771](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29771) aims to cover the pagination for this scenario * The `routing_key` property is used to route spans to exporters based on different parameters. This functionality is currently enabled only for `trace` pipeline types. It supports one of the following values: * `service`: exports spans based on their service name. This is useful when using processors like the span metrics, so all spans for each service are sent to consistent collector instances for metric collection. Otherwise, metrics for the same services are sent to different collectors, making aggregations inaccurate. * `traceID` (default): exports spans based on their `traceID`. @@ -162,6 +178,45 @@ service: - loadbalancing ``` +AWS CloudMap resolver example +```yaml +receivers: + otlp: + protocols: + grpc: + endpoint: localhost:4317 + +processors: + +exporters: + loadbalancing: + protocol: + otlp: + # all options from the OTLP exporter are supported + # except the endpoint + timeout: 3s + resolver: + awsCloudMap: + namespace: aws-namespace + serviceName: aws-otel-col-service-name + interval: 30s + +service: + pipelines: + traces: + receivers: + - otlp + processors: [] + exporters: + - loadbalancing + logs: + receivers: + - otlp + processors: [] + exporters: + - loadbalancing +``` + For testing purposes, the following configuration can be used, where both the load balancer and all backends are running locally: ```yaml receivers: diff --git a/exporter/loadbalancingexporter/config.go b/exporter/loadbalancingexporter/config.go index bfb7c057a686..582baaea0f89 100644 --- a/exporter/loadbalancingexporter/config.go +++ b/exporter/loadbalancingexporter/config.go @@ -6,6 +6,7 @@ package loadbalancingexporter // import "github.com/open-telemetry/opentelemetry import ( "time" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" "go.opentelemetry.io/collector/exporter/otlpexporter" ) @@ -32,9 +33,10 @@ type Protocol struct { // ResolverSettings defines the configurations for the backend resolver type ResolverSettings struct { - Static *StaticResolver `mapstructure:"static"` - DNS *DNSResolver `mapstructure:"dns"` - K8sSvc *K8sSvcResolver `mapstructure:"k8s"` + Static *StaticResolver `mapstructure:"static"` + DNS *DNSResolver `mapstructure:"dns"` + K8sSvc *K8sSvcResolver `mapstructure:"k8s"` + AWSCloudMap *AWSCloudMapResolver `mapstructure:"awsCloudMap"` } // StaticResolver defines the configuration for the resolver providing a fixed list of backends @@ -55,3 +57,12 @@ type K8sSvcResolver struct { Service string `mapstructure:"service"` Ports []int32 `mapstructure:"ports"` } + +type AWSCloudMapResolver struct { + NamespaceName string `mapstructure:"namespace"` + ServiceName string `mapstructure:"serviceName"` + HealthStatus types.HealthStatusFilter `mapstructure:"healthStatus"` + Interval time.Duration `mapstructure:"interval"` + Timeout time.Duration `mapstructure:"timeout"` + Port *uint16 `mapstructure:"port"` +} diff --git a/exporter/loadbalancingexporter/generated_component_test.go b/exporter/loadbalancingexporter/generated_component_test.go index 89d139bd0614..f8e5b0c1fc4f 100644 --- a/exporter/loadbalancingexporter/generated_component_test.go +++ b/exporter/loadbalancingexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 4c9de6343052..7137319a7ae3 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -3,30 +3,44 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadba go 1.21 require ( + github.com/aws/aws-sdk-go-v2/config v1.27.7 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 + github.com/aws/smithy-go v1.20.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 k8s.io/utils v0.0.0-20240102154912-e7106e64919e sigs.k8s.io/controller-runtime v0.17.2 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // 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 @@ -44,7 +58,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // 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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -75,38 +89,38 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect @@ -132,7 +146,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index bc3eb93460c2..1498e85ceba4 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -1,10 +1,33 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0= +github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= +github.com/aws/aws-sdk-go-v2/config v1.27.7 h1:JSfb5nOQF01iOgxFI5OIKWwDiEXWTyTgg1Mm1mHi0A4= +github.com/aws/aws-sdk-go-v2/config v1.27.7/go.mod h1:PH0/cNpoMO+B04qET699o5W92Ca79fVtbUnvMIZro4I= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982SyVKOJD+K8HIezu4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 h1:EyBZibRTVAs6ECHZOw5/wlylS9OcTzwyjeQMudmREjE= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1/go.mod h1:JKpmtYhhPs7D97NL/ltqz7yCkERFW5dOlHyVl66ZYF8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 h1:BdhnpGGsss5D70eA9WUDvK65HiPx0vyPmh+Tmh2Ue7U= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2/go.mod h1:zTbnRWj5oiNEAl7Vh0Gtr03gywl5R/qdDR8z2BmV7ns= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2/go.mod h1:JYzLoEVeLXk+L4tn1+rrkfhkxl6mLDEVaDSvGq9og90= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB2RnnQdguhXpmeQk= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8= +github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= +github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= 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= @@ -14,8 +37,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -27,8 +48,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= @@ -73,8 +92,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -166,8 +185,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -193,78 +212,78 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f 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= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= go.opentelemetry.io/contrib/propagators/b3 v1.24.0/go.mod h1:k5wRxKRU2uXx2F8uNJ4TaonuEO/V7/5xoz7kdsDACT8= go.opentelemetry.io/contrib/zpages v0.49.0 h1:Wk217PkNBxcKWnIQpwtbZZE286K4ZY9uajnM5woSeLU= @@ -352,7 +371,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -402,8 +421,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -430,14 +449,14 @@ 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= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/exporter/loadbalancingexporter/loadbalancer.go b/exporter/loadbalancingexporter/loadbalancer.go index a156ad9d9394..2f8773031412 100644 --- a/exporter/loadbalancingexporter/loadbalancer.go +++ b/exporter/loadbalancingexporter/loadbalancer.go @@ -44,7 +44,20 @@ type loadBalancer struct { func newLoadBalancer(params exporter.CreateSettings, cfg component.Config, factory componentFactory) (*loadBalancer, error) { oCfg := cfg.(*Config) - if oCfg.Resolver.DNS != nil && oCfg.Resolver.Static != nil { + var count = 0 + if oCfg.Resolver.DNS != nil { + count++ + } + if oCfg.Resolver.Static != nil { + count++ + } + if oCfg.Resolver.AWSCloudMap != nil { + count++ + } + if oCfg.Resolver.K8sSvc != nil { + count++ + } + if count > 1 { return nil, errMultipleResolversProvided } @@ -78,6 +91,15 @@ func newLoadBalancer(params exporter.CreateSettings, cfg component.Config, facto } } + if oCfg.Resolver.AWSCloudMap != nil { + awsCloudMapLogger := params.Logger.With(zap.String("resolver", "awsCloudMap")) + var err error + res, err = newCloudMapResolver(awsCloudMapLogger, &oCfg.Resolver.AWSCloudMap.NamespaceName, &oCfg.Resolver.AWSCloudMap.ServiceName, oCfg.Resolver.AWSCloudMap.Port, &oCfg.Resolver.AWSCloudMap.HealthStatus, oCfg.Resolver.AWSCloudMap.Interval, oCfg.Resolver.AWSCloudMap.Timeout) + if err != nil { + return nil, err + } + } + if res == nil { return nil, errNoResolver } @@ -148,7 +170,11 @@ func (lb *loadBalancer) removeExtraExporters(ctx context.Context, endpoints []st } for existing := range lb.exporters { if !endpointFound(existing, endpointsWithPort) { - _ = lb.exporters[existing].Shutdown(ctx) + exp := lb.exporters[existing] + // Shutdown the exporter asynchronously to avoid blocking the resolver + go func() { + _ = exp.Shutdown(ctx) + }() delete(lb.exporters, existing) } } @@ -164,9 +190,10 @@ func endpointFound(endpoint string, endpoints []string) bool { return false } -func (lb *loadBalancer) Shutdown(context.Context) error { +func (lb *loadBalancer) Shutdown(ctx context.Context) error { + err := lb.res.shutdown(ctx) lb.stopped = true - return nil + return err } // exporterAndEndpoint returns the exporter and the endpoint for the given identifier. diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index 26ad546a2cd8..f58428023f11 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -134,6 +134,7 @@ func TestWithDNSResolverNoEndpoints(t *testing.T) { err = p.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) + defer func() { assert.NoError(t, p.Shutdown(context.Background())) }() // test _, e, _ := p.exporterAndEndpoint([]byte{128, 128, 0, 0}) @@ -389,6 +390,43 @@ func TestFailedExporterInRing(t *testing.T) { assert.Error(t, err) } +func TestNewLoadBalancerInvalidNamespaceAwsResolver(t *testing.T) { + // prepare + cfg := &Config{ + Resolver: ResolverSettings{ + AWSCloudMap: &AWSCloudMapResolver{ + NamespaceName: "", + }, + }, + } + + // test + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) + + // verify + assert.Nil(t, p) + assert.True(t, clientcmd.IsConfigurationInvalid(err) || errors.Is(err, errNoNamespace)) +} + +func TestNewLoadBalancerInvalidServiceAwsResolver(t *testing.T) { + // prepare + cfg := &Config{ + Resolver: ResolverSettings{ + AWSCloudMap: &AWSCloudMapResolver{ + NamespaceName: "cloudmap", + ServiceName: "", + }, + }, + } + + // test + p, err := newLoadBalancer(exportertest.NewNopCreateSettings(), cfg, nil) + + // verify + assert.Nil(t, p) + assert.True(t, clientcmd.IsConfigurationInvalid(err) || errors.Is(err, errNoServiceName)) +} + func newNopMockExporter() *wrappedExporter { return newWrappedExporter(mockComponent{}) } diff --git a/exporter/loadbalancingexporter/log_exporter.go b/exporter/loadbalancingexporter/log_exporter.go index c59c2c189e8a..9b79bdc439dc 100644 --- a/exporter/loadbalancingexporter/log_exporter.go +++ b/exporter/loadbalancingexporter/log_exporter.go @@ -57,13 +57,14 @@ func (e *logExporterImp) Start(ctx context.Context, host component.Host) error { return e.loadBalancer.Start(ctx, host) } -func (e *logExporterImp) Shutdown(context.Context) error { +func (e *logExporterImp) Shutdown(ctx context.Context) error { if !e.started { return nil } + err := e.loadBalancer.Shutdown(ctx) e.started = false e.shutdownWg.Wait() - return nil + return err } func (e *logExporterImp) ConsumeLogs(ctx context.Context, ld plog.Logs) error { diff --git a/exporter/loadbalancingexporter/metrics_exporter.go b/exporter/loadbalancingexporter/metrics_exporter.go index 9cd5ea10a676..9e2ca747414f 100644 --- a/exporter/loadbalancingexporter/metrics_exporter.go +++ b/exporter/loadbalancingexporter/metrics_exporter.go @@ -74,10 +74,11 @@ func (e *metricExporterImp) Start(ctx context.Context, host component.Host) erro return e.loadBalancer.Start(ctx, host) } -func (e *metricExporterImp) Shutdown(context.Context) error { +func (e *metricExporterImp) Shutdown(ctx context.Context) error { + err := e.loadBalancer.Shutdown(ctx) e.stopped = true e.shutdownWg.Wait() - return nil + return err } func (e *metricExporterImp) ConsumeMetrics(ctx context.Context, md pmetric.Metrics) error { diff --git a/exporter/loadbalancingexporter/package_test.go b/exporter/loadbalancingexporter/package_test.go new file mode 100644 index 000000000000..4e898c447576 --- /dev/null +++ b/exporter/loadbalancingexporter/package_test.go @@ -0,0 +1,17 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package loadbalancingexporter + +import ( + "testing" + + "go.uber.org/goleak" +) + +// The IgnoreTopFunction call prevents catching the leak generated by opencensus +// defaultWorker.Start which at this time is part of the package's init call. +// See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")) +} diff --git a/exporter/loadbalancingexporter/resolver_aws_cloudmap.go b/exporter/loadbalancingexporter/resolver_aws_cloudmap.go new file mode 100644 index 000000000000..21d14107013f --- /dev/null +++ b/exporter/loadbalancingexporter/resolver_aws_cloudmap.go @@ -0,0 +1,219 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package loadbalancingexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" + +import ( + "context" + "errors" + "fmt" + "log" + "sort" + "sync" + "time" + + "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" + "go.opencensus.io/stats" + "go.opencensus.io/tag" + "go.uber.org/zap" +) + +const ( + defaultAwsResInterval = 30 * time.Second + defaultAwsResTimeout = 5 * time.Second +) + +var ( + errNoNamespace = errors.New("no Cloud Map namespace specified to resolve the backends") + errNoServiceName = errors.New("no Cloud Map serviceName specified to resolve the backends") + + awsResolverMutator = tag.Upsert(tag.MustNewKey("resolver"), "aws") + + awsResolverSuccessTrueMutators = []tag.Mutator{awsResolverMutator, successTrueMutator} + awsResolverSuccessFalseMutators = []tag.Mutator{awsResolverMutator, successFalseMutator} +) + +func createDiscoveryFunction(client *servicediscovery.Client) func(params *servicediscovery.DiscoverInstancesInput) (*servicediscovery.DiscoverInstancesOutput, error) { + return func(params *servicediscovery.DiscoverInstancesInput) (*servicediscovery.DiscoverInstancesOutput, error) { + return client.DiscoverInstances(context.TODO(), params) + } +} + +type cloudMapResolver struct { + logger *zap.Logger + + namespaceName *string + serviceName *string + port *uint16 + healthStatus *types.HealthStatusFilter + resInterval time.Duration + resTimeout time.Duration + + endpoints []string + onChangeCallbacks []func([]string) + + stopCh chan struct{} + updateLock sync.Mutex + shutdownWg sync.WaitGroup + changeCallbackLock sync.RWMutex + discoveryFn func(params *servicediscovery.DiscoverInstancesInput) (*servicediscovery.DiscoverInstancesOutput, error) +} + +func newCloudMapResolver(logger *zap.Logger, namespaceName *string, serviceName *string, port *uint16, healthStatus *types.HealthStatusFilter, interval time.Duration, timeout time.Duration) (*cloudMapResolver, error) { + // Using the SDK's default configuration, loading additional config + // and credentials values from the environment variables, shared + // credentials, and shared configuration files + cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithDefaultRegion("us-east-1")) + if err != nil { + log.Fatalf("unable to load SDK config, %v", err) + return nil, err + } + + // Using the Config value, create the DynamoDB client + svc := servicediscovery.NewFromConfig(cfg) + + if namespaceName == nil || len(*namespaceName) == 0 { + return nil, errNoNamespace + } + + if serviceName == nil || len(*serviceName) == 0 { + return nil, errNoServiceName + } + + if interval == 0 { + interval = defaultAwsResInterval + } + if timeout == 0 { + timeout = defaultAwsResTimeout + } + + if healthStatus == nil { + var healthStatusFilter = types.HealthStatusFilterHealthy + healthStatus = &healthStatusFilter + } + + return &cloudMapResolver{ + logger: logger, + namespaceName: namespaceName, + serviceName: serviceName, + port: port, + healthStatus: healthStatus, + resInterval: interval, + resTimeout: timeout, + stopCh: make(chan struct{}), + discoveryFn: createDiscoveryFunction(svc), + }, nil +} + +func (r *cloudMapResolver) start(ctx context.Context) error { + if _, err := r.resolve(ctx); err != nil { + r.logger.Warn("failed initial resolve", zap.Error(err)) + } + + go r.periodicallyResolve() + + r.logger.Info("AWS CloudMap resolver started", + zap.Stringp("serviceName", r.serviceName), + zap.Stringp("namespaceName", r.namespaceName), + zap.Uint16p("port", r.port), + zap.String("healthStatus", string(*r.healthStatus)), + zap.Duration("interval", r.resInterval), zap.Duration("timeout", r.resTimeout)) + return nil +} + +func (r *cloudMapResolver) shutdown(_ context.Context) error { + r.changeCallbackLock.Lock() + r.onChangeCallbacks = nil + r.changeCallbackLock.Unlock() + + close(r.stopCh) + r.shutdownWg.Wait() + return nil +} + +func (r *cloudMapResolver) periodicallyResolve() { + ticker := time.NewTicker(r.resInterval) + + for { + select { + case <-ticker.C: + ctx, cancel := context.WithTimeout(context.Background(), r.resTimeout) + if _, err := r.resolve(ctx); err != nil { + r.logger.Warn("failed to resolve", zap.Error(err)) + } else { + r.logger.Debug("resolved successfully") + } + cancel() + case <-r.stopCh: + return + } + } +} + +func (r *cloudMapResolver) resolve(ctx context.Context) ([]string, error) { + r.shutdownWg.Add(1) + defer r.shutdownWg.Done() + + discoverInstancesOutput, err := r.discoveryFn(&servicediscovery.DiscoverInstancesInput{ + NamespaceName: r.namespaceName, + ServiceName: r.serviceName, + HealthStatus: *r.healthStatus, + MaxResults: nil, + OptionalParameters: nil, + QueryParameters: nil, + }) + if err != nil { + _ = stats.RecordWithTags(ctx, awsResolverSuccessFalseMutators, mNumResolutions.M(1)) + return nil, err + } + + _ = stats.RecordWithTags(ctx, awsResolverSuccessTrueMutators, mNumResolutions.M(1)) + + r.logger.Debug("resolver has discovered instances ", + zap.Int("Instance Count", len(discoverInstancesOutput.Instances))) + + var backends []string + for _, instance := range discoverInstancesOutput.Instances { + ipAddr := instance.Attributes["AWS_INSTANCE_IPV4"] + var endpoint string + if r.port == nil { + ipPort := instance.Attributes["AWS_INSTANCE_PORT"] + endpoint = fmt.Sprintf("%s:%s", ipAddr, ipPort) + } else { + endpoint = fmt.Sprintf("%s:%d", ipAddr, *r.port) + } + r.logger.Debug("resolved instance", + zap.String("Endpoint", endpoint)) + backends = append(backends, endpoint) + } + + // keep it always in the same order + sort.Strings(backends) + + if equalStringSlice(r.endpoints, backends) { + return r.endpoints, nil + } + + // the list has changed! + r.updateLock.Lock() + r.endpoints = backends + r.updateLock.Unlock() + _ = stats.RecordWithTags(ctx, awsResolverSuccessTrueMutators, mNumBackends.M(int64(len(backends)))) + + // propagate the change + r.changeCallbackLock.RLock() + for _, callback := range r.onChangeCallbacks { + callback(r.endpoints) + } + r.changeCallbackLock.RUnlock() + + return r.endpoints, nil +} + +func (r *cloudMapResolver) onChange(f func([]string)) { + r.changeCallbackLock.Lock() + defer r.changeCallbackLock.Unlock() + r.onChangeCallbacks = append(r.onChangeCallbacks, f) +} diff --git a/exporter/loadbalancingexporter/resolver_aws_cloudmap_test.go b/exporter/loadbalancingexporter/resolver_aws_cloudmap_test.go new file mode 100644 index 000000000000..a236f14bce0b --- /dev/null +++ b/exporter/loadbalancingexporter/resolver_aws_cloudmap_test.go @@ -0,0 +1,112 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package loadbalancingexporter + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" + "github.com/aws/smithy-go/middleware" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.uber.org/zap" +) + +var instanceID = "test" +var namespaceName = "cloudmap" +var statusFilterHealthy = types.HealthStatusFilterHealthy + +var port uint16 = 1234 + +func TestInitialCloudMapResolution(t *testing.T) { + // prepare + + res := &cloudMapResolver{ + logger: zap.NewNop(), + namespaceName: &namespaceName, + serviceName: &instanceID, + healthStatus: &statusFilterHealthy, + resInterval: 5 * time.Second, + resTimeout: 1 * time.Second, + stopCh: make(chan struct{}), + discoveryFn: mockDiscovery, + } + + // test + var resolved []string + res.onChange(func(endpoints []string) { + resolved = endpoints + }) + require.NoError(t, res.start(context.Background())) + defer func() { + require.NoError(t, res.shutdown(context.Background())) + }() + + // verify + assert.Len(t, resolved, 3) + for i, value := range []string{"127.0.0.1:8080", "127.0.0.2:8080", "127.0.0.3:8080"} { + assert.Equal(t, value, resolved[i]) + } +} + +func TestInitialCloudMapResolutionWithPort(t *testing.T) { + // prepare + + res := &cloudMapResolver{ + logger: zap.NewNop(), + namespaceName: &namespaceName, + serviceName: &instanceID, + port: &port, + healthStatus: &statusFilterHealthy, + resInterval: 5 * time.Second, + resTimeout: 1 * time.Second, + stopCh: make(chan struct{}), + discoveryFn: mockDiscovery, + } + + // test + var resolved []string + res.onChange(func(endpoints []string) { + resolved = endpoints + }) + require.NoError(t, res.start(context.Background())) + defer func() { + require.NoError(t, res.shutdown(context.Background())) + }() + + // verify + assert.Len(t, resolved, 3) + for i, value := range []string{"127.0.0.1:1234", "127.0.0.2:1234", "127.0.0.3:1234"} { + assert.Equal(t, value, resolved[i]) + } +} + +func makeSummary(i int) types.HttpInstanceSummary { + return types.HttpInstanceSummary{ + Attributes: map[string]string{ + "AWS_INSTANCE_IPV4": fmt.Sprintf("127.0.0.%d", i), + "AWS_INSTANCE_PORT": "8080", + }, + HealthStatus: types.HealthStatusHealthy, + InstanceId: &instanceID, + NamespaceName: nil, + ServiceName: nil, + } +} +func mockDiscovery(*servicediscovery.DiscoverInstancesInput) (*servicediscovery.DiscoverInstancesOutput, error) { + + s := &servicediscovery.DiscoverInstancesOutput{ + Instances: []types.HttpInstanceSummary{ + makeSummary(1), + makeSummary(2), + makeSummary(3), + }, + ResultMetadata: middleware.Metadata{}, + } + return s, nil +} diff --git a/exporter/loadbalancingexporter/resolver_dns_test.go b/exporter/loadbalancingexporter/resolver_dns_test.go index 6f4ca264e403..ed55f3ce19fc 100644 --- a/exporter/loadbalancingexporter/resolver_dns_test.go +++ b/exporter/loadbalancingexporter/resolver_dns_test.go @@ -107,6 +107,7 @@ func TestCantResolve(t *testing.T) { // verify assert.NoError(t, err) + assert.NoError(t, res.shutdown(context.Background())) } func TestOnChange(t *testing.T) { diff --git a/exporter/loadbalancingexporter/resolver_static.go b/exporter/loadbalancingexporter/resolver_static.go index 8527669db834..86759f132bbe 100644 --- a/exporter/loadbalancingexporter/resolver_static.go +++ b/exporter/loadbalancingexporter/resolver_static.go @@ -49,7 +49,13 @@ func (r *staticResolver) start(ctx context.Context) error { return err } -func (r *staticResolver) shutdown(_ context.Context) error { +func (r *staticResolver) shutdown(context.Context) error { + r.endpoints = nil + + for _, callback := range r.onChangeCallbacks { + callback(r.endpoints) + } + return nil } diff --git a/exporter/loadbalancingexporter/testdata/config.yaml b/exporter/loadbalancingexporter/testdata/config.yaml index a1ec52ed8d85..5d42674d79e3 100644 --- a/exporter/loadbalancingexporter/testdata/config.yaml +++ b/exporter/loadbalancingexporter/testdata/config.yaml @@ -27,3 +27,14 @@ loadbalancing/3: dns: hostname: service-1 port: 55690 + +loadbalancing/4: + protocol: + otlp: + + # how to get the list of backends: DNS + resolver: + awsCloudMap: + namespace: cloudmap-1 + serviceName: service-1 + port: 4319 diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index d7e1dd1e5029..a6f955c69975 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -72,10 +72,11 @@ func (e *traceExporterImp) Start(ctx context.Context, host component.Host) error return e.loadBalancer.Start(ctx, host) } -func (e *traceExporterImp) Shutdown(context.Context) error { +func (e *traceExporterImp) Shutdown(ctx context.Context) error { + err := e.loadBalancer.Shutdown(ctx) e.stopped = true e.shutdownWg.Wait() - return nil + return err } func (e *traceExporterImp) ConsumeTraces(ctx context.Context, td ptrace.Traces) error { diff --git a/exporter/logicmonitorexporter/generated_component_test.go b/exporter/logicmonitorexporter/generated_component_test.go index e1a8f14804c2..08361ca97790 100644 --- a/exporter/logicmonitorexporter/generated_component_test.go +++ b/exporter/logicmonitorexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index cef91b289ec2..ddb51ef454c8 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -71,7 +71,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 203b4af2d8de..df7e4334ecbc 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -80,42 +80,42 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -169,8 +169,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/logzioexporter/generated_component_test.go b/exporter/logzioexporter/generated_component_test.go index 2e975d99def4..a9cb10971d20 100644 --- a/exporter/logzioexporter/generated_component_test.go +++ b/exporter/logzioexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 0a6d86a8f037..00395f526aee 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -4,20 +4,20 @@ go 1.21 require ( github.com/hashicorp/go-hclog v1.6.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -41,6 +41,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -56,18 +57,18 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -77,7 +78,7 @@ require ( golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index a67d7b11335c..e0d76d888041 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -35,12 +35,14 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= 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/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -82,8 +84,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -97,44 +99,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -194,8 +196,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index bd0078f5ca5a..901b73ef817b 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -41,8 +41,8 @@ func TestLoadConfigNewExporter(t *testing.T) { "X-Custom-Header": "loki_rocks", }, Endpoint: "https://loki:3100/loki/api/v1/push", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", CertFile: "certfile", KeyFile: "keyfile", diff --git a/exporter/lokiexporter/generated_component_test.go b/exporter/lokiexporter/generated_component_test.go index 2b3aa25c5205..7f18cd15120d 100644 --- a/exporter/lokiexporter/generated_component_test.go +++ b/exporter/lokiexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 8b46a1fd45be..67d9bdd2915f 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -8,18 +8,18 @@ require ( github.com/golang/snappy v0.0.4 github.com/grafana/loki/pkg/push v0.0.0-20231127162423-bd505f8e2d37 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -40,6 +40,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -60,15 +61,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -80,7 +81,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 8e64be4d2f8f..785158024919 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -104,8 +104,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -122,44 +122,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -197,8 +197,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -225,8 +225,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/mezmoexporter/generated_component_test.go b/exporter/mezmoexporter/generated_component_test.go index b075ef51e2da..0d2dbd025443 100644 --- a/exporter/mezmoexporter/generated_component_test.go +++ b/exporter/mezmoexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index 85e66d59edad..b2109bb0544a 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -5,14 +5,14 @@ go 1.21 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -47,17 +48,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index ecf7739d5419..c7f78eb1db14 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,44 +78,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -167,8 +169,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 5e80135b8291..1cd3b1a8b9bd 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -57,8 +57,8 @@ func TestLoadConfig(t *testing.T) { }, Endpoint: "1.2.3.4:1234", Compression: "gzip", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 54f8409442e2..4ff456c9fbd8 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -49,7 +49,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -62,7 +62,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -123,8 +123,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, }, @@ -137,8 +137,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/opencensusexporter/generated_component_test.go b/exporter/opencensusexporter/generated_component_test.go index c9356009d0f1..d84aadc3e869 100644 --- a/exporter/opencensusexporter/generated_component_test.go +++ b/exporter/opencensusexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index d39def742e37..4a2c28d9f3df 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,24 +9,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) 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 @@ -37,8 +36,9 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // 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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -60,17 +60,17 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 337a32fe0d76..83104811c3ac 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -1,9 +1,4 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= @@ -16,8 +11,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -25,8 +18,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -52,9 +43,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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= @@ -63,11 +53,12 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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.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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -129,48 +120,48 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -211,8 +202,6 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -242,8 +231,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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= @@ -258,8 +245,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -269,8 +256,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 947c632bbb95..5bc8001ef255 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -41,7 +41,7 @@ func TestSendTraces(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -83,7 +83,7 @@ func TestSendTraces_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -107,7 +107,7 @@ func TestSendTraces_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -140,7 +140,7 @@ func TestSendMetrics(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -180,7 +180,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } @@ -204,7 +204,7 @@ func TestSendMetrics_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, } diff --git a/exporter/opensearchexporter/generated_component_test.go b/exporter/opensearchexporter/generated_component_test.go index e40a2952d28b..f3abc6a94cca 100644 --- a/exporter/opensearchexporter/generated_component_test.go +++ b/exporter/opensearchexporter/generated_component_test.go @@ -63,20 +63,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index b3038f375d25..63a8f3ee969f 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/opensearch-project/opensearch-go/v2 v2.3.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -23,6 +23,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect @@ -57,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 @@ -75,7 +76,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index fc0b9aadaa81..ac53b83b4cd6 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -45,6 +45,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -104,42 +106,42 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -214,8 +216,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 9f4d83ea5ef7..057e2137fefb 100644 --- a/exporter/otelarrowexporter/config_test.go +++ b/exporter/otelarrowexporter/config_test.go @@ -66,8 +66,8 @@ func TestUnmarshalConfig(t *testing.T) { }, Endpoint: "1.2.3.4:1234", Compression: "none", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go index 1aa923384d6a..3c827d6b4ef4 100644 --- a/exporter/otelarrowexporter/factory_test.go +++ b/exporter/otelarrowexporter/factory_test.go @@ -77,7 +77,7 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -157,8 +157,8 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: filepath.Join("testdata", "test_cert.pem"), }, }, @@ -170,8 +170,8 @@ func TestCreateTracesExporter(t *testing.T) { config: Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index 579c8a09e057..f7aedcab2457 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -3,23 +3,23 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelar go 1.21 require ( - github.com/open-telemetry/otel-arrow v0.17.0 - github.com/open-telemetry/otel-arrow/collector v0.17.0 + github.com/open-telemetry/otel-arrow v0.18.0 + github.com/open-telemetry/otel-arrow/collector v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -37,9 +37,10 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.5 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -55,15 +56,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -75,8 +76,8 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.14.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index 9b4b2e87aad3..f50173c453d9 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -10,13 +6,9 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -49,8 +41,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.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= -github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -74,10 +66,10 @@ 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/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/open-telemetry/otel-arrow v0.17.0 h1:yYapoRCKGojEUSUZAT5oYEk1xKKIx0hqjhEriLQtlMs= -github.com/open-telemetry/otel-arrow v0.17.0/go.mod h1:XexRufxOt/u17cyweDpw4uESrn/6eAA4CFCLoFdWVLY= -github.com/open-telemetry/otel-arrow/collector v0.17.0 h1:yxgtbK7Tqy/XW0KGa3BSXkImLQlrZcHtjrOwWmrPcNc= -github.com/open-telemetry/otel-arrow/collector v0.17.0/go.mod h1:W+WMolLuMRCR9Us+ZPzNf5oUZb/1M5WRUql0o3sPP5k= +github.com/open-telemetry/otel-arrow v0.18.0 h1:v3KH1HIpdXRy+V5awAmn2M+uthbE52Qi7svBYSweASI= +github.com/open-telemetry/otel-arrow v0.18.0/go.mod h1:054cuTUlLVHH6Y//65bEPeMiHjYRs7DiX/el+yQbgYg= +github.com/open-telemetry/otel-arrow/collector v0.18.0 h1:1YFyQv3pYnU+RxXwhDmr6UeQ+TgOweznBxqc56A5pXQ= +github.com/open-telemetry/otel-arrow/collector v0.18.0/go.mod h1:2ifSqH498f+p/oX3RbR1jl0ej/YA0vyhXI9f8cJvNgo= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= 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= @@ -103,46 +95,46 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -176,8 +168,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -203,16 +193,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= 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.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 833a1a123776..d0eaf69d7fc9 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -37,8 +37,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "1.2.3.4:1234", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "certs/server.crt", KeyFile: "certs/server.key", CAFile: "certs/ca.crt", diff --git a/exporter/prometheusexporter/generated_component_test.go b/exporter/prometheusexporter/generated_component_test.go index 9fdc955b8305..98bfc75a3f89 100644 --- a/exporter/prometheusexporter/generated_component_test.go +++ b/exporter/prometheusexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 4629e8248cf4..cd7fbe85b04a 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 github.com/prometheus/client_golang v1.19.0 github.com/prometheus/client_model v0.6.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -137,16 +137,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -158,7 +158,7 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -169,7 +169,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 663081813e80..95689963c4f3 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -479,8 +479,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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= @@ -562,66 +562,66 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -757,8 +757,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -974,8 +974,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 763f3a34fef2..ccec75923914 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -98,8 +98,8 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { }, ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/certs/server.crt", KeyFile: "./testdata/certs/server.key", CAFile: "./testdata/certs/ca.crt", @@ -117,8 +117,8 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { exp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) require.NoError(t, err) - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.crt", CertFile: "./testdata/certs/client.crt", KeyFile: "./testdata/certs/client.key", diff --git a/exporter/prometheusremotewriteexporter/DESIGN.md b/exporter/prometheusremotewriteexporter/DESIGN.md index f1a14c1d4c22..3fbf369050f0 100644 --- a/exporter/prometheusremotewriteexporter/DESIGN.md +++ b/exporter/prometheusremotewriteexporter/DESIGN.md @@ -10,7 +10,7 @@ Date: July 30, 2020 Prometheus can be integrated with remote storage systems that supports its remote write API. Existing remote storage integration support is included in [Cortex](https://cortexmetrics.io/docs/api/), [influxDB](https://docs.influxdata.com/influxdb/v1.8/supported_protocols/prometheus/), and many [others](https://prometheus.io/docs/operating/integrations/#remote-endpoints-and-storage). -The following diagram shows an example of Prometheus remote write API usage, with Cortex,n open source, horizontally scalable, highly available, multi-tenant, long term storage, as a remote storage backend. +The following diagram shows an example of Prometheus remote write API usage, with Cortex, an open source, horizontally scalable, highly available, multi-tenant, long term storage, as a remote storage backend. ![Cortex Architecture](img/cortex.png) diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 8b6b7345fe77..690acbc25462 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -61,8 +61,8 @@ func TestLoadConfig(t *testing.T) { ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8888", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", // This is subject to change, but currently I have no idea what else to put here lol }, Insecure: false, diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index 7833efac299d..51825e709c0a 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -25,12 +25,35 @@ import ( "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" "go.uber.org/multierr" + "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter/internal/metadata" prometheustranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite" ) +type prwTelemetry interface { + recordTranslationFailure(ctx context.Context) + recordTranslatedTimeSeries(ctx context.Context, numTS int) +} + +type prwTelemetryOtel struct { + failedTranslations metric.Int64Counter + translatedTimeSeries metric.Int64Counter + otelAttrs []attribute.KeyValue +} + +func (p *prwTelemetryOtel) recordTranslationFailure(ctx context.Context) { + p.failedTranslations.Add(ctx, 1, metric.WithAttributes(p.otelAttrs...)) +} + +func (p *prwTelemetryOtel) recordTranslatedTimeSeries(ctx context.Context, numTS int) { + p.translatedTimeSeries.Add(ctx, int64(numTS), metric.WithAttributes(p.otelAttrs...)) +} + // prwExporter converts OTLP metrics to Prometheus remote write TimeSeries and sends them to a remote endpoint. type prwExporter struct { endpointURL *url.URL @@ -45,6 +68,31 @@ type prwExporter struct { retrySettings configretry.BackOffConfig wal *prweWAL exporterSettings prometheusremotewrite.Settings + telemetry prwTelemetry +} + +func newPRWTelemetry(set exporter.CreateSettings) (prwTelemetry, error) { + + meter := metadata.Meter(set.TelemetrySettings) + // TODO: create helper functions similar to the processor helper: BuildCustomMetricName + prefix := "exporter/" + metadata.Type.String() + "/" + failedTranslations, errFailedTranslation := meter.Int64Counter(prefix+"failed_translations", + metric.WithDescription("Number of translation operations that failed to translate metrics from Otel to Prometheus"), + metric.WithUnit("1"), + ) + + translatedTimeSeries, errTranslatedMetrics := meter.Int64Counter(prefix+"translated_time_series", + metric.WithDescription("Number of Prometheus time series that were translated from OTel metrics"), + metric.WithUnit("1"), + ) + + return &prwTelemetryOtel{ + failedTranslations: failedTranslations, + translatedTimeSeries: translatedTimeSeries, + otelAttrs: []attribute.KeyValue{ + attribute.String("exporter", set.ID.String()), + }, + }, errors.Join(errFailedTranslation, errTranslatedMetrics) } // newPRWExporter initializes a new prwExporter instance and sets fields accordingly. @@ -59,6 +107,11 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err return nil, errors.New("invalid endpoint") } + prwTelemetry, err := newPRWTelemetry(set) + if err != nil { + return nil, err + } + userAgentHeader := fmt.Sprintf("%s/%s", strings.ReplaceAll(strings.ToLower(set.BuildInfo.Description), " ", "-"), set.BuildInfo.Version) prwe := &prwExporter{ @@ -79,6 +132,7 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err AddMetricSuffixes: cfg.AddMetricSuffixes, SendMetadata: cfg.SendMetadata, }, + telemetry: prwTelemetry, } prwe.wal = newWAL(cfg.WAL, prwe.export) @@ -128,15 +182,19 @@ func (prwe *prwExporter) PushMetrics(ctx context.Context, md pmetric.Metrics) er tsMap, err := prometheusremotewrite.FromMetrics(md, prwe.exporterSettings) if err != nil { - err = consumererror.NewPermanent(err) + prwe.telemetry.recordTranslationFailure(ctx) + prwe.settings.Logger.Debug("failed to translate metrics, exporting remaining metrics", zap.Error(err), zap.Int("translated", len(tsMap))) } + prwe.telemetry.recordTranslatedTimeSeries(ctx, len(tsMap)) + var m []*prompb.MetricMetadata if prwe.exporterSettings.SendMetadata { m = prometheusremotewrite.OtelMetricsToMetadata(md, prwe.exporterSettings.AddMetricSuffixes) } + // Call export even if a conversion error, since there may be points that were successfully converted. - return multierr.Combine(err, prwe.handleExport(ctx, tsMap, m)) + return prwe.handleExport(ctx, tsMap, m) } } diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index ca146d84ff5a..cec87c5b0def 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -180,8 +180,8 @@ func Test_Start(t *testing.T) { returnErrorOnStartUp: true, clientSettings: confighttp.ClientConfig{ Endpoint: "https://some.url:9411/api/prom/push", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "non-existent file", CertFile: "", KeyFile: "", @@ -372,6 +372,19 @@ func runExportPipeline(ts *prompb.TimeSeries, endpoint *url.URL) error { return prwe.handleExport(context.Background(), testmap, nil) } +type mockPRWTelemetry struct { + failedTranslations int + translatedTimeSeries int +} + +func (m *mockPRWTelemetry) recordTranslationFailure(_ context.Context) { + m.failedTranslations++ +} + +func (m *mockPRWTelemetry) recordTranslatedTimeSeries(_ context.Context, numTs int) { + m.translatedTimeSeries += numTs +} + // Test_PushMetrics checks the number of TimeSeries received by server and the number of metrics dropped is the same as // expected func Test_PushMetrics(t *testing.T) { @@ -420,6 +433,11 @@ func Test_PushMetrics(t *testing.T) { emptySummaryBatch := getMetricsFromMetricList(invalidMetrics[emptySummary]) + // partial success (or partial failure) cases + + partialSuccess1 := getMetricsFromMetricList(validMetrics1[validSum], validMetrics2[validSum], + validMetrics1[validIntGauge], validMetrics2[validIntGauge], invalidMetrics[emptyGauge]) + // staleNaN cases staleNaNHistogramBatch := getMetricsFromMetricList(staleNaNMetrics[staleNaNHistogram]) staleNaNEmptyHistogramBatch := getMetricsFromMetricList(staleNaNMetrics[staleNaNEmptyHistogram]) @@ -457,20 +475,23 @@ func Test_PushMetrics(t *testing.T) { } tests := []struct { - name string - metrics pmetric.Metrics - reqTestFunc func(t *testing.T, r *http.Request, expected int, isStaleMarker bool) - expectedTimeSeries int - httpResponseCode int - returnErr bool - isStaleMarker bool - skipForWAL bool + name string + metrics pmetric.Metrics + reqTestFunc func(t *testing.T, r *http.Request, expected int, isStaleMarker bool) + expectedTimeSeries int + httpResponseCode int + returnErr bool + isStaleMarker bool + skipForWAL bool + expectedFailedTranslations int }{ { - name: "invalid_type_case", - metrics: invalidTypeBatch, - httpResponseCode: http.StatusAccepted, - returnErr: true, + name: "invalid_type_case", + metrics: invalidTypeBatch, + httpResponseCode: http.StatusAccepted, + reqTestFunc: checkFunc, + expectedTimeSeries: 1, // the resource target metric. + expectedFailedTranslations: 1, }, { name: "intSum_case", @@ -567,32 +588,40 @@ func Test_PushMetrics(t *testing.T) { skipForWAL: true, }, { - name: "emptyGauge_case", - metrics: emptyDoubleGaugeBatch, - reqTestFunc: checkFunc, - httpResponseCode: http.StatusAccepted, - returnErr: true, + name: "emptyGauge_case", + metrics: emptyDoubleGaugeBatch, + reqTestFunc: checkFunc, + httpResponseCode: http.StatusAccepted, + expectedFailedTranslations: 1, + }, + { + name: "emptyCumulativeSum_case", + metrics: emptyCumulativeSumBatch, + reqTestFunc: checkFunc, + httpResponseCode: http.StatusAccepted, + expectedFailedTranslations: 1, }, { - name: "emptyCumulativeSum_case", - metrics: emptyCumulativeSumBatch, - reqTestFunc: checkFunc, - httpResponseCode: http.StatusAccepted, - returnErr: true, + name: "emptyCumulativeHistogram_case", + metrics: emptyCumulativeHistogramBatch, + reqTestFunc: checkFunc, + httpResponseCode: http.StatusAccepted, + expectedFailedTranslations: 1, }, { - name: "emptyCumulativeHistogram_case", - metrics: emptyCumulativeHistogramBatch, - reqTestFunc: checkFunc, - httpResponseCode: http.StatusAccepted, - returnErr: true, + name: "emptySummary_case", + metrics: emptySummaryBatch, + reqTestFunc: checkFunc, + httpResponseCode: http.StatusAccepted, + expectedFailedTranslations: 1, }, { - name: "emptySummary_case", - metrics: emptySummaryBatch, - reqTestFunc: checkFunc, - httpResponseCode: http.StatusAccepted, - returnErr: true, + name: "partialSuccess_case", + metrics: partialSuccess1, + reqTestFunc: checkFunc, + httpResponseCode: http.StatusAccepted, + expectedTimeSeries: 4, + expectedFailedTranslations: 1, }, { name: "staleNaNIntGauge_case", @@ -668,6 +697,7 @@ func Test_PushMetrics(t *testing.T) { } t.Run(tt.name, func(t *testing.T) { t.Parallel() + mockTelemetry := &mockPRWTelemetry{} server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if tt.reqTestFunc != nil { tt.reqTestFunc(t, r, tt.expectedTimeSeries, tt.isStaleMarker) @@ -716,7 +746,10 @@ func Test_PushMetrics(t *testing.T) { } set := exportertest.NewNopCreateSettings() set.BuildInfo = buildInfo + prwe, nErr := newPRWExporter(cfg, set) + prwe.telemetry = mockTelemetry + require.NoError(t, nErr) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -729,6 +762,9 @@ func Test_PushMetrics(t *testing.T) { assert.Error(t, err) return } + + assert.Equal(t, tt.expectedFailedTranslations, mockTelemetry.failedTranslations) + assert.Equal(t, tt.expectedTimeSeries, mockTelemetry.translatedTimeSeries) assert.NoError(t, err) }) } diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index ea3be196bac5..ed86ed403a60 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -29,8 +29,8 @@ func Test_createMetricsExporter(t *testing.T) { invalidConfig := createDefaultConfig().(*Config) invalidConfig.ClientConfig = confighttp.ClientConfig{} invalidTLSConfig := createDefaultConfig().(*Config) - invalidTLSConfig.ClientConfig.TLSSetting = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + invalidTLSConfig.ClientConfig.TLSSetting = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "non-existent file", CertFile: "", KeyFile: "", diff --git a/exporter/prometheusremotewriteexporter/generated_component_test.go b/exporter/prometheusremotewriteexporter/generated_component_test.go index feee79c38994..5ffca178a9d8 100644 --- a/exporter/prometheusremotewriteexporter/generated_component_test.go +++ b/exporter/prometheusremotewriteexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 00993f7e1790..04fd6b4fad9b 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -14,15 +14,16 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -39,6 +40,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,25 +54,24 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/tidwall/gjson v1.10.2 // indirect 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect - go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -78,7 +79,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index d88ebea7022b..b2f695f7e67c 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -64,8 +66,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= @@ -90,44 +92,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -181,8 +183,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index dd5cbbbdd830..b052e7e2482d 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -6,18 +6,18 @@ require ( github.com/apache/pulsar-client-go v0.8.1 github.com/cenkalti/backoff/v4 v4.2.1 github.com/gogo/protobuf v1.3.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -44,10 +44,11 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.6 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -64,14 +65,14 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -79,13 +80,13 @@ require ( go.uber.org/atomic v1.11.0 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 1b07264f62d7..a25aac2feb83 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -242,8 +242,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= @@ -263,8 +263,8 @@ github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNr 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.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -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.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/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= @@ -358,8 +358,8 @@ github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOA github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -420,30 +420,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -571,8 +571,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -816,8 +816,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/sapmexporter/generated_component_test.go b/exporter/sapmexporter/generated_component_test.go index 8007975490d4..8a15e3679afc 100644 --- a/exporter/sapmexporter/generated_component_test.go +++ b/exporter/sapmexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index be36ebdd6d64..967809c309e4 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -4,20 +4,20 @@ go 1.21 require ( github.com/cenkalti/backoff/v4 v4.2.1 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/klauspost/compress v1.17.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -47,15 +48,15 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -65,7 +66,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 7486e23a2789..d19b383f024c 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -58,8 +58,10 @@ 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/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -93,8 +95,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -114,32 +116,32 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -218,8 +220,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/sentryexporter/generated_component_test.go b/exporter/sentryexporter/generated_component_test.go index 28e5fe7698ab..e22a7b4b5e9b 100644 --- a/exporter/sentryexporter/generated_component_test.go +++ b/exporter/sentryexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 91520fbacfda..c47f4caf515b 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -40,12 +41,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -56,7 +57,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index b57015eed162..f86c0e16505f 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -72,28 +74,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -145,8 +147,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index aed4f7c82d9a..d7b27608c9b2 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -68,7 +68,7 @@ type Config struct { // ingest_tls needs to be set if the exporter's IngestURL is pointing to a signalfx receiver // with TLS enabled and using a self-signed certificate where its CA is not loaded in the system cert pool. - IngestTLSSettings configtls.TLSClientSetting `mapstructure:"ingest_tls,omitempty"` + IngestTLSSettings configtls.ClientConfig `mapstructure:"ingest_tls,omitempty"` // APIURL is the destination to where SignalFx metadata will be sent. This // value takes precedence over the value of Realm @@ -76,7 +76,7 @@ type Config struct { // api_tls needs to be set if the exporter's APIURL is pointing to a httforwarder extension // with TLS enabled and using a self-signed certificate where its CA is not loaded in the system cert pool. - APITLSSettings configtls.TLSClientSetting `mapstructure:"api_tls,omitempty"` + APITLSSettings configtls.ClientConfig `mapstructure:"api_tls,omitempty"` // Whether to log datapoints dispatched to Splunk Observability Cloud LogDataPoints bool `mapstructure:"log_data_points"` diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 1aee96407471..b5203af95ed6 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -1277,13 +1277,13 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, - APITLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + APITLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, @@ -1297,8 +1297,8 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/missingfile", }, }, @@ -1313,8 +1313,8 @@ func TestTLSExporterInit(t *testing.T) { config: &Config{ APIURL: "https://test", IngestURL: "https://test", - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/invalid-ca.pem", }, }, @@ -1384,8 +1384,8 @@ func TestTLSIngestConnection(t *testing.T) { config: &Config{ APIURL: serverURL, IngestURL: serverURL, - IngestTLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + IngestTLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, @@ -1497,8 +1497,8 @@ func TestTLSAPIConnection(t *testing.T) { IngestURL: server.URL, AccessToken: "random", SyncHostMetadata: true, - APITLSSettings: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + APITLSSettings: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/certs/ca.pem", }, }, diff --git a/exporter/signalfxexporter/generated_component_test.go b/exporter/signalfxexporter/generated_component_test.go index 189d9cc9d455..bd3e511048c3 100644 --- a/exporter/signalfxexporter/generated_component_test.go +++ b/exporter/signalfxexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index c92d593777fb..50e92f0b4f31 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -17,16 +17,16 @@ require ( github.com/shirou/gopsutil/v3 v3.24.2 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,6 +48,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -71,15 +72,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.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -88,7 +89,7 @@ require ( golang.org/x/net v0.22.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 1b154895c9ec..ed65333639f9 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -115,44 +117,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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -211,8 +213,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index d1e9db2f7c03..27633dcb2d1b 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -56,8 +56,8 @@ func TestTrackerStart(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 3f53ff4356bc..c86f14588567 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -66,8 +66,8 @@ func TestLoadConfig(t *testing.T) { }, Endpoint: "1.2.3.4:11800", Compression: "gzip", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/var/lib/mycert.pem", }, Insecure: false, diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index e5f5880e3015..37b732f71040 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -39,7 +39,7 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -100,8 +100,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "testdata/test_cert.pem", }, Insecure: false, @@ -115,8 +115,8 @@ func TestCreateTracesExporter(t *testing.T) { config: &Config{ ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "nosuchfile", }, }, diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 6250a9d1f7e1..90cfb4d4ee8c 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -7,24 +7,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -35,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -51,17 +51,17 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index 5697a99b1bc7..ef11767d0b3e 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -1,10 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -20,8 +15,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -32,8 +25,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -76,6 +67,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -130,48 +123,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/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -227,8 +220,6 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -286,8 +277,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -303,8 +292,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index a62aff28ffbf..4a232bbb19ad 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -128,7 +128,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan }, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index cebb52485bb0..e75c957b621c 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -33,7 +33,7 @@ func TestSwExporter(t *testing.T) { NumStreams: 10, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -106,7 +106,7 @@ func TestSwExporter(t *testing.T) { NumStreams: 10, ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/exporter/splunkhecexporter/README.md b/exporter/splunkhecexporter/README.md index 054767b51797..a1b25d96841f 100644 --- a/exporter/splunkhecexporter/README.md +++ b/exporter/splunkhecexporter/README.md @@ -39,8 +39,7 @@ The following configuration options can also be configured: - `key_file` (no default) Path to the TLS key to use for TLS required connections. - `max_content_length_logs` (default: 2097152): Maximum log payload size in bytes. Log batches of bigger size will be broken down into several requests. Default value is 2097152 bytes (2 MiB). Maximum allowed value is 838860800 - (~ 800 MB). Keep in mind that Splunk Observability backend doesn't accept requests bigger than 2 MiB. This - configuration value can be raised only if used with Splunk Core/Cloud. When set to 0, it will treat as infinite length and it will create only 1 request per batch. + (~ 800 MB). When set to 0, it will treat as infinite length and it will create only 1 request per batch. - `max_content_length_metrics` (default: 2097152): Maximum metric payload size in bytes. Metric batches of bigger size will be broken down into several requests. Default value is 2097152 bytes (2 MiB). Maximum allowed value is 838860800 (~ 800 MB). When set to 0, it will treat as infinite length and it will create only one request per batch. diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 36a8b1a71783..e2943797d1ff 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -202,7 +202,9 @@ func (c *capturingData) ServeHTTP(w http.ResponseWriter, r *http.Request) { panic(err) } go func() { - c.receivedRequest <- receivedRequest{body, r.Header} + if c.receivedRequest != nil { + c.receivedRequest <- receivedRequest{body, r.Header} + } }() w.WriteHeader(c.statusCode) } @@ -1266,7 +1268,7 @@ func Test_PushMetricsData_Summary_NaN_Sum(t *testing.T) { func TestReceiveMetricsWithCompression(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.MaxContentLengthMetrics = 1800 - request, err := runMetricsExport(cfg, createMetricsData(1, 100), 1, false, t) + request, err := runMetricsExport(cfg, createMetricsData(1, 100), 2, false, t) assert.NoError(t, err) assert.Equal(t, "gzip", request[0].headers.Get("Content-Encoding")) assert.NotEqual(t, "", request) @@ -1363,8 +1365,7 @@ func TestInvalidURL(t *testing.T) { } func TestHeartbeatStartupFailed(t *testing.T) { - rr := make(chan receivedRequest) - capture := capturingData{receivedRequest: rr, statusCode: 403} + capture := capturingData{statusCode: 403} listener, err := net.Listen("tcp", "127.0.0.1:0") if err != nil { panic(err) @@ -1396,8 +1397,9 @@ func TestHeartbeatStartupFailed(t *testing.T) { assert.NoError(t, err) assert.EqualError(t, exporter.Start(context.Background(), componenttest.NewNopHost()), - fmt.Sprintf("%s: heartbeat on startup failed: HTTP 403 \"Forbidden\"", params.ID.Type()), + fmt.Sprintf("%s: heartbeat on startup failed: HTTP 403 \"Forbidden\"", params.ID.String()), ) + assert.NoError(t, exporter.Shutdown(context.Background())) } func TestHeartbeatStartupPass_Disabled(t *testing.T) { @@ -1433,11 +1435,11 @@ func TestHeartbeatStartupPass_Disabled(t *testing.T) { exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) + assert.NoError(t, exporter.Shutdown(context.Background())) } func TestHeartbeatStartupPass(t *testing.T) { - rr := make(chan receivedRequest) - capture := capturingData{receivedRequest: rr, statusCode: 200} + capture := capturingData{statusCode: 200} listener, err := net.Listen("tcp", "127.0.0.1:0") if err != nil { panic(err) @@ -1468,6 +1470,7 @@ func TestHeartbeatStartupPass(t *testing.T) { exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NoError(t, exporter.Start(context.Background(), componenttest.NewNopHost())) + assert.NoError(t, exporter.Shutdown(context.Background())) } type badJSON struct { diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index dd6c4c689581..023b3eed3a6e 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -63,8 +63,8 @@ func TestLoadConfig(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Endpoint: "https://splunk:8088/services/collector", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "", CertFile: "", KeyFile: "", diff --git a/exporter/splunkhecexporter/generated_component_test.go b/exporter/splunkhecexporter/generated_component_test.go index 4f617c1b3d48..96814b3ddc8a 100644 --- a/exporter/splunkhecexporter/generated_component_test.go +++ b/exporter/splunkhecexporter/generated_component_test.go @@ -70,20 +70,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 6f91e7abd26e..de50c54c0ad6 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -13,18 +13,19 @@ require ( github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 gopkg.in/yaml.v3 v3.0.1 @@ -82,21 +83,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -109,7 +110,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index e5c20908d9e8..c1280771ae29 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -155,8 +155,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -182,48 +182,48 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -286,7 +286,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -321,8 +321,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/splunkhecexporter/integration_test.go b/exporter/splunkhecexporter/integration_test.go index 26b108fc899a..72c8d736e954 100644 --- a/exporter/splunkhecexporter/integration_test.go +++ b/exporter/splunkhecexporter/integration_test.go @@ -10,7 +10,7 @@ import ( "crypto/tls" "fmt" "net/http" - "os" + "net/url" "os/exec" "strconv" "testing" @@ -58,7 +58,7 @@ func teardown(cfg SplunkContainerConfig) { fmt.Println("Stopping container") err := cfg.container.Terminate(cfg.conCtx) if err != nil { - fmt.Printf("Error while terminiating container") + fmt.Printf("Error while terminating container") panic(err) } // Remove docker image after tests @@ -74,17 +74,6 @@ func teardown(cfg SplunkContainerConfig) { fmt.Printf("Command output:\n%s\n", output) } -func TestMain(m *testing.M) { - splunkContCfg := setup() - - // Run the tests - code := m.Run() - - teardown(splunkContCfg) - // Exit with the test result code - os.Exit(code) -} - func createInsecureClient() *http.Client { // Create a custom transport with insecure settings tr := &http.Transport{ @@ -222,177 +211,180 @@ func prepareTracesData(index string, source string, sourcetype string) ptrace.Tr return traces } -func TestSplunkHecExporterEventsToSplunk(t *testing.T) { - logger := zaptest.NewLogger(t) - logger.Info("Test -> Splunk running at:", zap.String("host", integrationtestutils.GetConfigVariable("HOST")), - zap.String("uiPort", integrationtestutils.GetConfigVariable("UI_PORT")), - zap.String("hecPort", integrationtestutils.GetConfigVariable("HEC_PORT")), - zap.String("managementPort", integrationtestutils.GetConfigVariable("MANAGEMENT_PORT")), - ) - // 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.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" - config.Source = "otel" - config.SourceType = "st-otel" - config.Index = "main" - config.TLSSetting.InsecureSkipVerify = true - - url, err := config.getURL() - require.NoError(t, err, "Must not error while getting URL") - settings := exportertest.NewNopCreateSettings() - c := newLogsClient(settings, config) - logs := prepareLogs() - httpClient := createInsecureClient() - c.hecWorker = &defaultHecWorker{url, httpClient, buildHTTPHeaders(config, component.NewDefaultBuildInfo())} +type cfg struct { + event string + index string + source string + sourcetype string +} - err = c.pushLogData(context.Background(), logs) - require.NoError(t, err, "Must not error while sending Logs data") - waitForEventToBeIndexed() +type telemetryType string - query := "index=main *" - events := integrationtestutils.CheckEventsFromSplunk(query, "-3h@h") - logger.Info("Splunk received %d events in the last minute", zap.Int("no. of events", len(events))) - assert.True(t, len(events) == 1) - // check events fields - data, ok := events[0].(map[string]any) - if !ok { - logger.Info("Invalid event format") - } - assert.True(t, "test log" == data["_raw"].(string)) - assert.True(t, "main" == data["index"].(string)) - assert.True(t, "otel" == data["source"].(string)) - assert.True(t, "st-otel" == data["sourcetype"].(string)) +var metricsType = telemetryType("metrics") +var logsType = telemetryType("logs") +var tracesType = telemetryType("traces") + +type testCfg struct { + name string + config *cfg + startTime string + telType telemetryType } -func TestSplunkHecExporterEventsToSplunkNonDefaultIndex(t *testing.T) { - logger := zaptest.NewLogger(t) - logger.Info("Test -> Splunk running at:", zap.String("host", integrationtestutils.GetConfigVariable("HOST")), - zap.String("uiPort", integrationtestutils.GetConfigVariable("UI_PORT")), - zap.String("hecPort", integrationtestutils.GetConfigVariable("HEC_PORT")), - zap.String("managementPort", integrationtestutils.GetConfigVariable("MANAGEMENT_PORT")), - ) - - event := "This is my new event! And some number 101" - index := integrationtestutils.GetConfigVariable("EVENT_INDEX") - source := "otel-source" - sourcetype := "sck-otel-st" - - // 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.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" - config.Source = "otel" - config.SourceType = "st-otel" - config.Index = "main" - config.TLSSetting.InsecureSkipVerify = true - - url, err := config.getURL() - require.NoError(t, err, "Must not error while getting URL") +func logsTest(t *testing.T, config *Config, url *url.URL, test testCfg) { settings := exportertest.NewNopCreateSettings() c := newLogsClient(settings, config) - logs := prepareLogsNonDefaultParams(index, source, sourcetype, event) + var logs plog.Logs + if test.config.index != "main" { + logs = prepareLogsNonDefaultParams(test.config.index, test.config.source, test.config.sourcetype, test.config.event) + } else { + logs = prepareLogs() + } + httpClient := createInsecureClient() c.hecWorker = &defaultHecWorker{url, httpClient, buildHTTPHeaders(config, component.NewDefaultBuildInfo())} - err = c.pushLogData(context.Background(), logs) + err := c.pushLogData(context.Background(), logs) require.NoError(t, err, "Must not error while sending Logs data") waitForEventToBeIndexed() - query := "index=" + index + " *" - events := integrationtestutils.CheckEventsFromSplunk(query, "-1m@m") - logger.Info("Splunk received %d events in the last minute", zap.Int("no. of events", len(events))) - assert.True(t, len(events) == 1) + events := integrationtestutils.CheckEventsFromSplunk("index="+test.config.index+" *", test.startTime) + assert.Equal(t, len(events), 1) // check events fields data, ok := events[0].(map[string]any) - if !ok { - logger.Info("Invalid event format") - } - assert.True(t, event == data["_raw"].(string)) - assert.True(t, index == data["index"].(string)) - assert.True(t, source == data["source"].(string)) - assert.True(t, sourcetype == data["sourcetype"].(string)) + assert.True(t, ok, "Invalid event format") + assert.Equal(t, test.config.event, data["_raw"].(string)) + assert.Equal(t, test.config.index, data["index"].(string)) + assert.Equal(t, test.config.source, data["source"].(string)) + assert.Equal(t, test.config.sourcetype, data["sourcetype"].(string)) } -func TestSplunkHecExporterMetricsToSplunk(t *testing.T) { - logger := zaptest.NewLogger(t) - logger.Info("Test -> Splunk running at:", zap.String("host", integrationtestutils.GetConfigVariable("HOST")), - zap.String("uiPort", integrationtestutils.GetConfigVariable("UI_PORT")), - zap.String("hecPort", integrationtestutils.GetConfigVariable("HEC_PORT")), - zap.String("managementPort", integrationtestutils.GetConfigVariable("MANAGEMENT_PORT")), - ) - index := integrationtestutils.GetConfigVariable("METRIC_INDEX") - metricName := "test.metric" - // 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.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" - config.Source = "otel" - config.SourceType = "st-otel" - config.Index = index - config.TLSSetting.InsecureSkipVerify = true - - url, err := config.getURL() - require.NoError(t, err, "Must not error while getting URL") +func metricsTest(t *testing.T, config *Config, url *url.URL, test testCfg) { settings := exportertest.NewNopCreateSettings() c := newMetricsClient(settings, config) - metricData := prepareMetricsData(metricName) + metricData := prepareMetricsData(test.config.event) httpClient := createInsecureClient() c.hecWorker = &defaultHecWorker{url, httpClient, buildHTTPHeaders(config, component.NewDefaultBuildInfo())} - err = c.pushMetricsData(context.Background(), metricData) + err := c.pushMetricsData(context.Background(), metricData) require.NoError(t, err, "Must not error while sending Metrics data") waitForEventToBeIndexed() - events := integrationtestutils.CheckMetricsFromSplunk(index, metricName) - assert.True(t, len(events) == 1, "Events length is less than 1. No metrics found") + events := integrationtestutils.CheckMetricsFromSplunk(test.config.index, test.config.event) + assert.Equal(t, len(events), 1, "Events length is less than 1. No metrics found") } -func TestSplunkHecExporterTracesToSplunk(t *testing.T) { - logger := zaptest.NewLogger(t) - logger.Info("Test -> Splunk running at:", zap.String("host", integrationtestutils.GetConfigVariable("HOST")), - zap.String("uiPort", integrationtestutils.GetConfigVariable("UI_PORT")), - zap.String("hecPort", integrationtestutils.GetConfigVariable("HEC_PORT")), - zap.String("managementPort", integrationtestutils.GetConfigVariable("MANAGEMENT_PORT")), - ) - index := integrationtestutils.GetConfigVariable("TRACE_INDEX") - source := "trace-source" - sourcetype := "trace-sourcetype" - // 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.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" - config.Source = "otel" - config.SourceType = "st-otel" - config.Index = "main" - config.TLSSetting.InsecureSkipVerify = true - - url, err := config.getURL() - require.NoError(t, err, "Must not error while getting URL") +func tracesTest(t *testing.T, config *Config, url *url.URL, test testCfg) { settings := exportertest.NewNopCreateSettings() c := newTracesClient(settings, config) - tracesData := prepareTracesData(index, source, sourcetype) + tracesData := prepareTracesData(test.config.index, test.config.source, test.config.sourcetype) httpClient := createInsecureClient() c.hecWorker = &defaultHecWorker{url, httpClient, buildHTTPHeaders(config, component.NewDefaultBuildInfo())} - err = c.pushTraceData(context.Background(), tracesData) + err := c.pushTraceData(context.Background(), tracesData) require.NoError(t, err, "Must not error while sending Trace data") - waitForEventToBeIndexed() - query := "index=" + index + " *" - events := integrationtestutils.CheckEventsFromSplunk(query, "-1m@m") - logger.Info("Splunk received %d events in the last minute", zap.Int("no. of events", len(events))) - assert.True(t, len(events) == 1) + + events := integrationtestutils.CheckEventsFromSplunk("index="+test.config.index+" *", test.startTime) + assert.Equal(t, len(events), 1) // check fields data, ok := events[0].(map[string]any) - if !ok { - logger.Info("Invalid event format") + assert.True(t, ok, "Invalid event format") + assert.Equal(t, test.config.index, data["index"].(string)) + assert.Equal(t, test.config.source, data["source"].(string)) + assert.Equal(t, test.config.sourcetype, data["sourcetype"].(string)) +} + +func TestSplunkHecExporter(t *testing.T) { + splunkContCfg := setup() + defer teardown(splunkContCfg) + + tests := []testCfg{ + { + name: "Events to Splunk", + config: &cfg{ + event: "test log", + index: "main", + source: "otel", + sourcetype: "st-otel", + }, + startTime: "-3h@h", + telType: logsType, + }, + { + name: "Events to Splunk - Non default index", + config: &cfg{ + event: "This is my new event! And some number 101", + index: integrationtestutils.GetConfigVariable("EVENT_INDEX"), + source: "otel-source", + sourcetype: "sck-otel-st", + }, + startTime: "-1m@m", + telType: logsType, + }, + { + name: "Events to Splunk - metrics", + config: &cfg{ + event: "test.metric", + index: integrationtestutils.GetConfigVariable("METRIC_INDEX"), + source: "otel", + sourcetype: "st-otel", + }, + startTime: "", + telType: metricsType, + }, + { + name: "Events to Splunk - traces", + config: &cfg{ + event: "", + index: integrationtestutils.GetConfigVariable("TRACE_INDEX"), + source: "trace-source", + sourcetype: "trace-sourcetype", + }, + startTime: "-1m@m", + telType: tracesType, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + logger := zaptest.NewLogger(t) + logger.Info("Test -> Splunk running at:", zap.String("host", integrationtestutils.GetConfigVariable("HOST")), + zap.String("uiPort", integrationtestutils.GetConfigVariable("UI_PORT")), + zap.String("hecPort", integrationtestutils.GetConfigVariable("HEC_PORT")), + zap.String("managementPort", integrationtestutils.GetConfigVariable("MANAGEMENT_PORT")), + ) + + // 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.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.Source = "otel" + config.SourceType = "st-otel" + + if test.telType == metricsType { + config.Index = test.config.index + } else { + config.Index = "main" + } + config.TLSSetting.InsecureSkipVerify = true + + url, err := config.getURL() + require.NoError(t, err, "Must not error while getting URL") + + switch test.telType { + case logsType: + logsTest(t, config, url, test) + case metricsType: + metricsTest(t, config, url, test) + case tracesType: + tracesTest(t, config, url, test) + default: + assert.Fail(t, "Telemetry type must be set to one of the following values: metrics, traces, or logs.") + } + }) } - assert.True(t, index == data["index"].(string)) - assert.True(t, source == data["source"].(string)) - assert.True(t, sourcetype == data["sourcetype"].(string)) } func waitForEventToBeIndexed() { diff --git a/exporter/splunkhecexporter/internal/integrationtestutils/splunk.go b/exporter/splunkhecexporter/internal/integrationtestutils/splunk.go index f89ea09b9be4..4d5e47cf1676 100644 --- a/exporter/splunkhecexporter/internal/integrationtestutils/splunk.go +++ b/exporter/splunkhecexporter/internal/integrationtestutils/splunk.go @@ -112,7 +112,7 @@ func checkSearchJobStatusCode(user string, password string, baseURL string, jobI // logger.Println(checkJSONResponse) // debug // Print isDone field from response isDone := checkJSONResponse["entry"].([]any)[0].(map[string]any)["content"].(map[string]any)["isDone"] - logger.Printf("Is Splunk Search compleated [isDone flag]: %v\n", isDone) + logger.Printf("Is Splunk Search completed [isDone flag]: %v\n", isDone) return isDone } func postSearchRequest(user string, password string, baseURL string, searchQuery string, startTime string, endTime string) string { diff --git a/exporter/splunkhecexporter/package_test.go b/exporter/splunkhecexporter/package_test.go new file mode 100644 index 000000000000..6bf200240882 --- /dev/null +++ b/exporter/splunkhecexporter/package_test.go @@ -0,0 +1,17 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package splunkhecexporter + +import ( + "testing" + + "go.uber.org/goleak" +) + +// The IgnoreTopFunction call prevents catching the leak generated by opencensus +// defaultWorker.Start which at this time is part of the package's init call. +// See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")) +} diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go index 568400ef74e7..16382c6942c7 100644 --- a/exporter/sumologicexporter/config.go +++ b/exporter/sumologicexporter/config.go @@ -62,9 +62,9 @@ type Config struct { // createDefaultClientConfig returns default http client settings func createDefaultClientConfig() confighttp.ClientConfig { - return confighttp.ClientConfig{ - Timeout: defaultTimeout, - } + config := confighttp.NewDefaultClientConfig() + config.Timeout = defaultTimeout + return config } // LogFormatType represents log_format diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 906cd7d415e3..c37ad2e8ebb3 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -40,7 +40,9 @@ func TestCreateDefaultConfig(t *testing.T) { GraphiteTemplate: "%{_metric_}", ClientConfig: confighttp.ClientConfig{ - Timeout: 5 * time.Second, + IdleConnTimeout: confighttp.NewDefaultClientConfig().IdleConnTimeout, + MaxIdleConns: confighttp.NewDefaultClientConfig().MaxIdleConns, + Timeout: 5 * time.Second, }, BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: qs, diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 65ef254e28cb..f579fd6dd684 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -30,6 +30,7 @@ require ( github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -46,17 +47,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 8546a8ae2591..a9a6daeb8cfe 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -58,6 +58,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -113,42 +115,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -229,8 +231,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/exporter/syslogexporter/config.go b/exporter/syslogexporter/config.go index c5f0c9c3d767..31f0c0c4bfc1 100644 --- a/exporter/syslogexporter/config.go +++ b/exporter/syslogexporter/config.go @@ -38,7 +38,7 @@ type Config struct { EnableOctetCounting bool `mapstructure:"enable_octet_counting"` // TLSSetting struct exposes TLS client configuration. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls"` + TLSSetting configtls.ClientConfig `mapstructure:"tls"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/syslogexporter/exporter_test.go b/exporter/syslogexporter/exporter_test.go index 58a025701b3a..189e89e73f40 100644 --- a/exporter/syslogexporter/exporter_test.go +++ b/exporter/syslogexporter/exporter_test.go @@ -191,27 +191,27 @@ func TestTLSConfig(t *testing.T) { tests := []struct { name string network string - tlsSettings configtls.TLSClientSetting + tlsSettings configtls.ClientConfig tlsConfig *tls.Config }{ {name: "TCP with TLS configuration", network: "tcp", - tlsSettings: configtls.TLSClientSetting{}, + tlsSettings: configtls.ClientConfig{}, tlsConfig: &tls.Config{}, }, {name: "TCP insecure", network: "tcp", - tlsSettings: configtls.TLSClientSetting{Insecure: true}, + tlsSettings: configtls.ClientConfig{Insecure: true}, tlsConfig: nil, }, {name: "UDP with TLS configuration", network: "udp", - tlsSettings: configtls.TLSClientSetting{}, + tlsSettings: configtls.ClientConfig{}, tlsConfig: nil, }, {name: "UDP insecure", network: "udp", - tlsSettings: configtls.TLSClientSetting{Insecure: true}, + tlsSettings: configtls.ClientConfig{Insecure: true}, tlsConfig: nil, }, } diff --git a/exporter/syslogexporter/go.mod b/exporter/syslogexporter/go.mod index e7edaa74c64b..18b0fe394ed8 100644 --- a/exporter/syslogexporter/go.mod +++ b/exporter/syslogexporter/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -20,6 +20,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -27,11 +28,11 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -49,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.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -58,7 +59,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/syslogexporter/go.sum b/exporter/syslogexporter/go.sum index fe9de16642d3..f87377a56536 100644 --- a/exporter/syslogexporter/go.sum +++ b/exporter/syslogexporter/go.sum @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -66,30 +68,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -141,8 +143,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 330f8278db8f..a230e20e3b33 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.9.0 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -43,12 +44,12 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -58,7 +59,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index a8302e7d610e..4544e9c3a047 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -77,30 +79,30 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxC github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -152,8 +154,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index cd317d160568..db89e0619f7a 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { Endpoint: "https://somedest:1234/api/v2/spans", WriteBufferSize: 524288, Timeout: 5 * time.Second, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, MaxIdleConns: &maxIdleConns, diff --git a/exporter/zipkinexporter/generated_component_test.go b/exporter/zipkinexporter/generated_component_test.go index c223b5d0bc5c..226279eed4ab 100644 --- a/exporter/zipkinexporter/generated_component_test.go +++ b/exporter/zipkinexporter/generated_component_test.go @@ -56,20 +56,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case exporter.Logs: + switch test.name { + case "logs": + e, ok := c.(exporter.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case exporter.Metrics: + case "metrics": + e, ok := c.(exporter.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case exporter.Traces: + case "traces": + e, ok := c.(exporter.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 96e0674262e9..4034a358bab5 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -36,8 +36,9 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -51,19 +52,19 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -75,7 +76,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index aa04b59c64af..8d5f72465159 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -32,10 +32,12 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -70,8 +72,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -84,44 +86,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -175,8 +177,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/ackextension/go.mod b/extension/ackextension/go.mod index 1d641b0d4e06..ff16e58d33a0 100644 --- a/extension/ackextension/go.mod +++ b/extension/ackextension/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 ) @@ -21,9 +21,9 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -31,7 +31,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/ackextension/go.sum b/extension/ackextension/go.sum index 01b57dffb9d6..39bc13f5f031 100644 --- a/extension/ackextension/go.sum +++ b/extension/ackextension/go.sum @@ -50,16 +50,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -111,8 +111,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 04c34646ad23..1dcccbf1886c 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -3,18 +3,18 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapa go 1.21 require ( - bitbucket.org/atlassian/go-asap/v2 v2.7.0 + bitbucket.org/atlassian/go-asap/v2 v2.8.0 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -39,8 +39,8 @@ require ( github.com/prometheus/common v0.48.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 09c398f91b44..a363688e0e82 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -1,5 +1,5 @@ -bitbucket.org/atlassian/go-asap/v2 v2.7.0 h1:TKL1UN1rAJzHM4/8eURzFwdE3K6TEl/EN9XtahvqYX0= -bitbucket.org/atlassian/go-asap/v2 v2.7.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= +bitbucket.org/atlassian/go-asap/v2 v2.8.0 h1:JL4jktrZT3H8GHkkeJ1RCdhJ5YcOyVccA/2TJ4ae3I0= +bitbucket.org/atlassian/go-asap/v2 v2.8.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= @@ -66,20 +66,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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -134,8 +134,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/awsproxy/README.md b/extension/awsproxy/README.md index b6b31428afd3..beeb2b3f76a0 100644 --- a/extension/awsproxy/README.md +++ b/extension/awsproxy/README.md @@ -35,6 +35,7 @@ extensions: role_arn: "" aws_endpoint: "" local_mode: false + service_name: "xray" ``` ### endpoint (Optional) @@ -66,3 +67,5 @@ The IAM role used by this proxy when communicating with the AWS service. If non- ### aws_endpoint (Optional) The AWS service endpoint which this proxy forwards requests to. If not set, will default to the AWS X-Ray endpoint. +### service_name (Optional) +The AWS service name which this proxy forwards requests to. If not set, will default to "xray" diff --git a/extension/awsproxy/config_test.go b/extension/awsproxy/config_test.go index 294569979f34..a6171a652990 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -37,13 +37,14 @@ func TestLoadConfig(t *testing.T) { Endpoint: "0.0.0.0:1234", }, ProxyAddress: "https://proxy.proxy.com", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, ServerName: "something", }, Region: "us-west-1", RoleARN: "arn:aws:iam::123456789012:role/awesome_role", AWSEndpoint: "https://another.aws.endpoint.com", + ServiceName: "es", }, }, }, diff --git a/extension/awsproxy/factory.go b/extension/awsproxy/factory.go index b371d643b4c0..9c56133faceb 100644 --- a/extension/awsproxy/factory.go +++ b/extension/awsproxy/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 3f12e04796fb..057c1e765b8d 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -39,10 +40,10 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -52,7 +53,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 0258598eb321..c2310915cb6d 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -24,6 +24,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -63,24 +65,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -132,8 +134,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/awsproxy/testdata/config.yaml b/extension/awsproxy/testdata/config.yaml index 4c49c01f9f05..95a454c45979 100644 --- a/extension/awsproxy/testdata/config.yaml +++ b/extension/awsproxy/testdata/config.yaml @@ -8,3 +8,4 @@ awsproxy/1: region: "us-west-1" role_arn: "arn:aws:iam::123456789012:role/awesome_role" aws_endpoint: "https://another.aws.endpoint.com" + service_name: "es" diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 3c02afed6ac2..840bd1600f93 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 github.com/tg123/go-htpasswd v1.2.2 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index fbfeb63cc879..a2beae3b394e 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -21,6 +21,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -61,24 +63,24 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -132,8 +134,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index d45888523092..ddc5ab5bc40b 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 1a7682895547..be09277156a0 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -21,6 +21,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -53,20 +55,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -118,8 +120,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/README.md b/extension/encoding/README.md index e588856b780e..624e4b044994 100644 --- a/extension/encoding/README.md +++ b/extension/encoding/README.md @@ -13,7 +13,7 @@ worked towards. ### Development -- Add endcoding extensions support additionally to the existing ways of configuring encodings (where applicable) +- Add encoding extensions support additionally to the existing ways of configuring encodings (where applicable) to the following components: - `file receiver` - `file exporter` @@ -31,8 +31,8 @@ worked towards. ```yaml extensions: zipkin_encoding: - format: proto - version: v1 + protocol: zipkin_proto + version: v2 receivers: kafka: diff --git a/extension/encoding/go.mod b/extension/encoding/go.mod index f05575e4a239..ebd943d5ca7b 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.21 require ( - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -33,6 +33,6 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/extension/encoding/go.sum b/extension/encoding/go.sum index 77cf3b4d07a0..f97a1f66a6d7 100644 --- a/extension/encoding/go.sum +++ b/extension/encoding/go.sum @@ -57,16 +57,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -118,8 +118,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/jaegerencodingextension/go.mod b/extension/encoding/jaegerencodingextension/go.mod index 5a0ab961b5e7..3e14873aecf9 100644 --- a/extension/encoding/jaegerencodingextension/go.mod +++ b/extension/encoding/jaegerencodingextension/go.mod @@ -4,14 +4,14 @@ go 1.21 require ( github.com/gogo/protobuf v1.3.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -38,10 +39,10 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -52,7 +53,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/encoding/jaegerencodingextension/go.sum b/extension/encoding/jaegerencodingextension/go.sum index 09160894ce52..59b2e6359014 100644 --- a/extension/encoding/jaegerencodingextension/go.sum +++ b/extension/encoding/jaegerencodingextension/go.sum @@ -24,8 +24,10 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -56,8 +58,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -68,18 +70,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -131,8 +133,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/jsonlogencodingextension/go.mod b/extension/encoding/jsonlogencodingextension/go.mod index 8bacb687f1ee..11fbf95b1767 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -36,7 +37,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/encoding/jsonlogencodingextension/go.sum b/extension/encoding/jsonlogencodingextension/go.sum index d5053097425e..fc2ddd5ba317 100644 --- a/extension/encoding/jsonlogencodingextension/go.sum +++ b/extension/encoding/jsonlogencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -125,8 +127,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/otlpencodingextension/go.mod b/extension/encoding/otlpencodingextension/go.mod index 5b43f34f5ec8..2946d2fa5352 100644 --- a/extension/encoding/otlpencodingextension/go.mod +++ b/extension/encoding/otlpencodingextension/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -36,7 +37,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/encoding/otlpencodingextension/go.sum b/extension/encoding/otlpencodingextension/go.sum index d5053097425e..fc2ddd5ba317 100644 --- a/extension/encoding/otlpencodingextension/go.sum +++ b/extension/encoding/otlpencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -125,8 +127,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/textencodingextension/go.mod b/extension/encoding/textencodingextension/go.mod index b7fc203fd16e..321dd93a5399 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -37,7 +38,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -48,7 +49,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum index 09b65a12f2cb..cf2a2ea94b35 100644 --- a/extension/encoding/textencodingextension/go.sum +++ b/extension/encoding/textencodingextension/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,16 +66,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -125,8 +127,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/encoding/zipkinencodingextension/go.mod b/extension/encoding/zipkinencodingextension/go.mod index 979660622a93..564917e4d4aa 100644 --- a/extension/encoding/zipkinencodingextension/go.mod +++ b/extension/encoding/zipkinencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,7 +25,8 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/jaegertracing/jaeger v1.55.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 @@ -39,10 +40,10 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -53,7 +54,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/encoding/zipkinencodingextension/go.sum b/extension/encoding/zipkinencodingextension/go.sum index c20620e19c2c..913b4405dbd5 100644 --- a/extension/encoding/zipkinencodingextension/go.sum +++ b/extension/encoding/zipkinencodingextension/go.sum @@ -24,8 +24,10 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -58,8 +60,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -70,18 +72,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -133,8 +135,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 746fc15c1d19..c900135badee 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,16 +4,16 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -35,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index 3b073ff70edb..d1fc82f5c3e8 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -57,22 +59,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -124,8 +126,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 16729c019b64..43dc962b1ae7 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -34,8 +34,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CAFile: "/path/to/ca", CertFile: "/path/to/cert", KeyFile: "/path/to/key", diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index c0e42d89a92a..cc86405c1615 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.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( 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.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -44,15 +45,15 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -63,7 +64,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 58f471a74747..3e7a10b695d3 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -57,6 +57,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -111,36 +113,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -221,8 +223,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/extension/httpforwarderextension/extension_test.go b/extension/httpforwarderextension/extension_test.go index 352fe7b331dd..3a9747857d34 100644 --- a/extension/httpforwarderextension/extension_test.go +++ b/extension/httpforwarderextension/extension_test.go @@ -132,8 +132,8 @@ func TestExtension(t *testing.T) { config: &Config{ Egress: confighttp.ClientConfig{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/extension/httpforwarderextension/generated_component_test.go b/extension/httpforwarderextension/generated_component_test.go new file mode 100644 index 000000000000..9b0d80b0414e --- /dev/null +++ b/extension/httpforwarderextension/generated_component_test.go @@ -0,0 +1,42 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package httpforwarderextension + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/extension/extensiontest" +) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + 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)) + t.Run("shutdown", func(t *testing.T) { + e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = e.Shutdown(context.Background()) + require.NoError(t, err) + }) + t.Run("lifecycle", func(t *testing.T) { + firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, firstExt.Shutdown(context.Background())) + + secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, secondExt.Shutdown(context.Background())) + }) +} diff --git a/extension/httpforwarderextension/go.mod b/extension/httpforwarderextension/go.mod index 4d302d8bd2e5..e76f89ea03e2 100644 --- a/extension/httpforwarderextension/go.mod +++ b/extension/httpforwarderextension/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,14 +43,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -60,7 +61,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/httpforwarderextension/go.sum b/extension/httpforwarderextension/go.sum index 9d84a494c68e..075467a7404d 100644 --- a/extension/httpforwarderextension/go.sum +++ b/extension/httpforwarderextension/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -69,36 +71,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -152,8 +154,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/httpforwarderextension/metadata.yaml b/extension/httpforwarderextension/metadata.yaml index a20969151d2b..566cda76d1e3 100644 --- a/extension/httpforwarderextension/metadata.yaml +++ b/extension/httpforwarderextension/metadata.yaml @@ -9,7 +9,9 @@ status: codeowners: active: [atoulme, rmfitzpatrick] -# TODO: Update the extension to make the tests pass tests: - skip_lifecycle: true - skip_shutdown: true + config: + ingress: + endpoint: localhost:7070 + egress: + endpoint: http://target/ \ No newline at end of file diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 45b3e321767d..cd9ef017e888 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, Source: Source{ Remote: &configgrpc.ClientConfig{ @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, Source: Source{ ReloadInterval: time.Second, diff --git a/extension/jaegerremotesampling/extension_test.go b/extension/jaegerremotesampling/extension_test.go index 53be6b87d7d8..072b45268e76 100644 --- a/extension/jaegerremotesampling/extension_test.go +++ b/extension/jaegerremotesampling/extension_test.go @@ -102,7 +102,7 @@ func TestRemote(t *testing.T) { cfg.Source.ReloadInterval = tc.reloadInterval cfg.Source.Remote = &configgrpc.ClientConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", lis.Addr().(*net.TCPAddr).Port), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, // test only }, WaitForReady: true, diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 0fbbe898230d..a952674da6ef 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { GRPCServerConfig: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(14250), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, Source: Source{}, diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index 237e8806a25b..10b37cec0f09 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -21,7 +21,7 @@ func TestCreateDefaultConfig(t *testing.T) { HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 1b1070119de5..cf339c4dd7f9 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -4,24 +4,24 @@ go 1.21 require ( github.com/fortytw2/leaktest v1.3.0 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -38,6 +38,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -53,7 +54,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect @@ -64,14 +65,14 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 00d2018877e9..269303707e4f 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -1,8 +1,3 @@ -cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= @@ -11,14 +6,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -46,14 +37,16 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -93,8 +86,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -131,42 +124,42 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -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/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -200,8 +193,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -222,12 +213,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/jaegerremotesampling/internal/grpc.go b/extension/jaegerremotesampling/internal/grpc.go index 5dcc85dff672..ef9f1842850e 100644 --- a/extension/jaegerremotesampling/internal/grpc.go +++ b/extension/jaegerremotesampling/internal/grpc.go @@ -57,7 +57,7 @@ type SamplingGRPCServer struct { } func (s *SamplingGRPCServer) Start(ctx context.Context, host component.Host) error { - server, err := s.settings.ToServer(host, s.telemetry) + server, err := s.settings.ToServerContext(ctx, host, s.telemetry) if err != nil { return err } diff --git a/extension/jaegerremotesampling/internal/grpc_test.go b/extension/jaegerremotesampling/internal/grpc_test.go index 731b6a40412c..1ce92a729b9b 100644 --- a/extension/jaegerremotesampling/internal/grpc_test.go +++ b/extension/jaegerremotesampling/internal/grpc_test.go @@ -27,7 +27,7 @@ func TestStartAndStopGRPC(t *testing.T) { srvSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "127.0.0.1:0", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), srvSettings, &mockCfgMgr{}) diff --git a/extension/oauth2clientauthextension/README.md b/extension/oauth2clientauthextension/README.md index f52040a97db4..f72b8e6925f6 100644 --- a/extension/oauth2clientauthextension/README.md +++ b/extension/oauth2clientauthextension/README.md @@ -57,7 +57,8 @@ exporters: otlp/withauth: endpoint: 0.0.0.0:5000 - ca_file: /tmp/certs/ca.pem + tls: + ca_file: /tmp/certs/ca.pem auth: authenticator: oauth2client diff --git a/extension/oauth2clientauthextension/config.go b/extension/oauth2clientauthextension/config.go index c5e31064070a..ea99916f4d73 100644 --- a/extension/oauth2clientauthextension/config.go +++ b/extension/oauth2clientauthextension/config.go @@ -49,7 +49,7 @@ type Config struct { Scopes []string `mapstructure:"scopes,omitempty"` // TLSSetting struct exposes TLS client configuration for the underneath client to authorization server. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` // Timeout parameter configures `http.Client.Timeout` for the underneath client to authorization // server while fetching and refreshing tokens. diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index 288b4340c567..10fae26ecaf7 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -45,8 +45,8 @@ func TestLoadConfig(t *testing.T) { Scopes: []string{"api.metrics"}, TokenURL: "https://example2.com/oauth2/default/v1/token", Timeout: time.Second, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "cafile", CertFile: "certfile", KeyFile: "keyfile", diff --git a/extension/oauth2clientauthextension/extension_test.go b/extension/oauth2clientauthextension/extension_test.go index 2e68687aeafd..bfc0886cbf77 100644 --- a/extension/oauth2clientauthextension/extension_test.go +++ b/extension/oauth2clientauthextension/extension_test.go @@ -43,8 +43,8 @@ func TestOAuthClientSettings(t *testing.T) { TokenURL: "https://example.com/v1/token", Scopes: []string{"resource.read"}, Timeout: 2, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: testCAFile, CertFile: testCertFile, KeyFile: testKeyFile, @@ -64,8 +64,8 @@ func TestOAuthClientSettings(t *testing.T) { TokenURL: "https://example.com/v1/token", Scopes: []string{"resource.read"}, Timeout: 2, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: testCAFile, CertFile: "doestexist.cert", KeyFile: testKeyFile, diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index bc779674151b..c0831e7b3310 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,20 +4,20 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.18.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -47,13 +48,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 4c310db5abd5..02f9aad6c1e3 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -30,6 +30,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -75,36 +77,36 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -176,8 +178,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 93476cd9d911..6760e09b96ae 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -82,7 +82,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 031f8c528c4e..069e3303df24 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -137,16 +137,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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -215,8 +215,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/observer/dockerobserver/integration_test.go b/extension/observer/dockerobserver/integration_test.go index 68c7dad13346..26362af8b12e 100644 --- a/extension/observer/dockerobserver/integration_test.go +++ b/extension/observer/dockerobserver/integration_test.go @@ -16,24 +16,12 @@ import ( "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) -type testHost struct { - component.Host - t *testing.T -} - -// ReportFatalError causes the test to be run to fail. -func (h *testHost) ReportFatalError(err error) { - h.t.Fatalf("Receiver reported a fatal error: %v", err) -} - -var _ component.Host = (*testHost)(nil) - func TestObserverEmitsEndpointsIntegration(t *testing.T) { image := "docker.io/library/nginx" tag := "1.17" @@ -226,9 +214,7 @@ func startObserverWithConfig(t *testing.T, listener observer.Notify, c *Config) obvs, ok := ext.(*dockerObserver) require.True(t, ok) require.NoError(t, err, "failed creating extension") - require.NoError(t, obvs.Start(ctx, &testHost{ - t: t, - })) + require.NoError(t, obvs.Start(ctx, componenttest.NewNopHost())) go obvs.ListAndWatch(listener) return obvs diff --git a/extension/observer/ecsobserver/README.md b/extension/observer/ecsobserver/README.md index 73bb1119e302..21a399e6fa10 100644 --- a/extension/observer/ecsobserver/README.md +++ b/extension/observer/ecsobserver/README.md @@ -443,7 +443,7 @@ otel's own /metrics. ### Error Handling -- Auth and cluster not found error will cause the extension to stop (calling `host.ReportFatalError`). Although IAM role +- Auth and cluster not found error will cause the extension to stop (calling `ReportStatus`). Although IAM role can be updated at runtime without restarting the collector, it's better to fail to make the problem obvious. Same applies to cluster not found. In the future we can add config to downgrade those errors if user want to monitor an ECS cluster with collector running outside the cluster, the collector can run anywhere as long as it can reach scrape diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 79519f5066da..bb4e7d587e55 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.27 github.com/hashicorp/golang-lru v1.0.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index a65b5d4ebac9..4ec6084143fe 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -22,6 +22,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -61,16 +63,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -122,8 +124,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 0f9cfef42746..1f73bdab50c1 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,16 +43,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -62,7 +63,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 68ad940714e4..2f87d69bd660 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -71,36 +73,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -154,8 +156,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 17103a39fb9b..7d545b1f5d74 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.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -41,8 +42,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.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -52,7 +53,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index be441eabda67..e4d7f2f4eaea 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -24,6 +24,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -80,16 +82,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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -145,8 +147,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 059d53b80e12..3c7f2bcf6267 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -29,7 +29,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -54,8 +54,8 @@ require ( github.com/prometheus/common v0.48.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -69,7 +69,7 @@ require ( golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index c9c092efadcc..94953d1bd72f 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -113,8 +113,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -264,16 +264,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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -515,8 +515,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -558,14 +558,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/extension/oidcauthextension/extension.go b/extension/oidcauthextension/extension.go index 6acb8680981f..a9b537b02d8a 100644 --- a/extension/oidcauthextension/extension.go +++ b/extension/oidcauthextension/extension.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/coreos/go-oidc" + "github.com/coreos/go-oidc/v3/oidc" "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension/auth" diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index a4062c7aef9d..61d5e7e4919f 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidca go 1.21 require ( - github.com/coreos/go-oidc v2.2.1+incompatible + github.com/coreos/go-oidc/v3 v3.10.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -19,24 +19,25 @@ 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.1 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -49,9 +50,8 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index a1ba559817ef..9ea0e3add0a3 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -2,11 +2,12 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= -github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= 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= @@ -23,6 +24,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -47,8 +50,6 @@ 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/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= -github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= @@ -59,29 +60,27 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -153,8 +152,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= @@ -162,8 +161,5 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -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= diff --git a/extension/opampextension/config.go b/extension/opampextension/config.go index 0ed2bb11e4a1..7756b1e1164a 100644 --- a/extension/opampextension/config.go +++ b/extension/opampextension/config.go @@ -46,7 +46,7 @@ func (caps Capabilities) toAgentCapabilities() protobufs.AgentCapabilities { type commonFields struct { Endpoint string `mapstructure:"endpoint"` - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` Headers map[string]configopaque.String `mapstructure:"headers,omitempty"` } @@ -87,13 +87,13 @@ func (s OpAMPServer) GetHeaders() map[string]configopaque.String { return map[string]configopaque.String{} } -func (s OpAMPServer) GetTLSSetting() configtls.TLSClientSetting { +func (s OpAMPServer) GetTLSSetting() configtls.ClientConfig { if s.WS != nil { return s.WS.TLSSetting } else if s.HTTP != nil { return s.HTTP.TLSSetting } - return configtls.TLSClientSetting{} + return configtls.ClientConfig{} } func (s OpAMPServer) GetEndpoint() string { diff --git a/extension/opampextension/config_test.go b/extension/opampextension/config_test.go index 364f1236f1e5..7a0d0ddd4461 100644 --- a/extension/opampextension/config_test.go +++ b/extension/opampextension/config_test.go @@ -97,7 +97,7 @@ func TestConfig_Getters(t *testing.T) { Headers: map[string]configopaque.String{ "test": configopaque.String("test"), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -118,7 +118,7 @@ func TestConfig_Getters(t *testing.T) { Headers: map[string]configopaque.String{ "test": configopaque.String("test"), }, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/extension/opampextension/go.mod b/extension/opampextension/go.mod index 36454d874d48..8bbf0cc5b2e9 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.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -44,7 +44,7 @@ require ( github.com/prometheus/common v0.48.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.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -54,6 +54,6 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/extension/opampextension/go.sum b/extension/opampextension/go.sum index 378532ee1198..4f23ca9746f3 100644 --- a/extension/opampextension/go.sum +++ b/extension/opampextension/go.sum @@ -64,22 +64,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -131,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index b7345ba9bbe6..27af8794537f 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -35,9 +36,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 5e6c5baf5ebe..daedc3f23339 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -53,20 +55,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -118,8 +120,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/remotetapextension/go.mod b/extension/remotetapextension/go.mod index 94c0a1c0cd4b..6b886614dbbd 100644 --- a/extension/remotetapextension/go.mod +++ b/extension/remotetapextension/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -38,16 +39,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -59,7 +60,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/remotetapextension/go.sum b/extension/remotetapextension/go.sum index 9d84a494c68e..075467a7404d 100644 --- a/extension/remotetapextension/go.sum +++ b/extension/remotetapextension/go.sum @@ -25,6 +25,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -69,36 +71,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -152,8 +154,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 0cfc18d13b79..04b2a5ad5f59 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,14 +8,14 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.4 github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -36,6 +36,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -46,8 +47,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index e23d80124b75..d77227dec488 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -45,6 +45,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -77,18 +79,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -140,8 +142,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index 18054821bbe5..fef5eaae54f6 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -21,6 +21,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -31,8 +32,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -42,7 +43,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index 0a18a0f35fa6..1e6c11191bd2 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -51,16 +53,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -112,8 +114,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/storage/dbstorage/go.mod b/extension/storage/dbstorage/go.mod index 50813f911e40..ffe915398b5d 100644 --- a/extension/storage/dbstorage/go.mod +++ b/extension/storage/dbstorage/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/stora go 1.21 require ( - github.com/jackc/pgx/v4 v4.18.1 + github.com/jackc/pgx/v4 v4.18.3 github.com/mattn/go-sqlite3 v1.14.22 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,11 +24,12 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -42,19 +43,19 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/net v0.20.0 // indirect + golang.org/x/crypto v0.20.0 // indirect + golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/storage/dbstorage/go.sum b/extension/storage/dbstorage/go.sum index 2e05ca86a53d..a53849e34432 100644 --- a/extension/storage/dbstorage/go.sum +++ b/extension/storage/dbstorage/go.sum @@ -34,6 +34,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -44,8 +46,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= -github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -61,8 +63,8 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= -github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= @@ -76,12 +78,11 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= -github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= 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= @@ -144,32 +145,26 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -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.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -208,16 +203,13 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= 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= @@ -225,14 +217,11 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -246,22 +235,15 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.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= @@ -275,7 +257,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -284,8 +265,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/storage/filestorage/go.mod b/extension/storage/filestorage/go.mod index 4ae6fdd06406..87a33a5623a7 100644 --- a/extension/storage/filestorage/go.mod +++ b/extension/storage/filestorage/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 go.etcd.io/bbolt v1.3.9 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/storage/filestorage/go.sum b/extension/storage/filestorage/go.sum index e7b8acf81aa6..b4fd7ebc2dbc 100644 --- a/extension/storage/filestorage/go.sum +++ b/extension/storage/filestorage/go.sum @@ -19,6 +19,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -55,18 +57,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -120,8 +122,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 40550f5ec7b3..a3107c9af7f7 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -28,9 +28,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect @@ -43,7 +43,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/extension/storage/go.sum b/extension/storage/go.sum index 0a18a0f35fa6..c6a541f7679a 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -51,16 +51,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -112,8 +112,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/sumologicextension/README.md b/extension/sumologicextension/README.md index 225437747609..3d4b169541e0 100644 --- a/extension/sumologicextension/README.md +++ b/extension/sumologicextension/README.md @@ -2,12 +2,12 @@ | Status | | | ------------- |-----------| -| Stability | [development] | +| Stability | [alpha] | | 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 +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/extension/sumologicextension/extension_test.go b/extension/sumologicextension/extension_test.go index 96fa759198d4..f5435323affa 100644 --- a/extension/sumologicextension/extension_test.go +++ b/extension/sumologicextension/extension_test.go @@ -25,6 +25,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension/api" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension/credentials" + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension/internal/metadata" ) func TestMain(m *testing.M) { @@ -74,7 +75,7 @@ func TestBasicExtensionConstruction(t *testing.T) { for _, tc := range testcases { t.Run(tc.Name, func(t *testing.T) { - se, err := newSumologicExtension(tc.Config, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(tc.Config, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") if tc.WantErr { assert.Error(t, err) } else { @@ -137,7 +138,7 @@ func TestBasicStart(t *testing.T) { cfg.Credentials.InstallationToken = "dummy_install_token" cfg.CollectorCredentialsDirectory = dir - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) assert.NotEmpty(t, se.registrationInfo.CollectorCredentialID) @@ -213,7 +214,7 @@ func TestStoreCredentials(t *testing.T) { // Ensure the directory doesn't exist before running the extension require.NoError(t, os.RemoveAll(dir)) - se, err := newSumologicExtension(cfg, logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) key := createHashKey(cfg) fileName, err := credentials.HashKeyToFilename(key) @@ -239,7 +240,7 @@ func TestStoreCredentials(t *testing.T) { // Ensure the directory has 600 permissions require.NoError(t, os.Chmod(dir, 0600)) - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) key := createHashKey(cfg) fileName, err := credentials.HashKeyToFilename(key) @@ -264,7 +265,7 @@ func TestStoreCredentials(t *testing.T) { // Ensure the directory has 700 permissions require.NoError(t, os.Chmod(dir, 0700)) - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) key := createHashKey(cfg) fileName, err := credentials.HashKeyToFilename(key) @@ -287,7 +288,7 @@ func TestStoreCredentials(t *testing.T) { cfg := getConfig(srv.URL) cfg.CollectorCredentialsDirectory = dir - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) key := createHashKey(cfg) fileName, err := credentials.HashKeyToFilename(key) @@ -372,7 +373,7 @@ func TestStoreCredentials_PreexistingCredentialsAreUsed(t *testing.T) { }), ) - se, err := newSumologicExtension(cfg, logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) fileName, err := credentials.HashKeyToFilename(hashKey) @@ -467,7 +468,7 @@ func TestLocalFSCredentialsStore_WorkCorrectlyForMultipleExtensions(t *testing.T logger2, err := zap.NewDevelopment(zap.Fields(zap.Int("#", 2))) require.NoError(t, err) - se1, err := newSumologicExtension(cfg1, logger1, component.NewID("sumologic"), "1.0.0") + se1, err := newSumologicExtension(cfg1, logger1, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) t.Cleanup(func() { require.NoError(t, se1.Shutdown(context.Background())) }) fileName1, err := credentials.HashKeyToFilename(createHashKey(cfg1)) @@ -477,7 +478,7 @@ func TestLocalFSCredentialsStore_WorkCorrectlyForMultipleExtensions(t *testing.T require.NoError(t, se1.Start(context.Background(), componenttest.NewNopHost())) require.FileExists(t, credsPath1) - se2, err := newSumologicExtension(cfg2, logger2, component.NewID("sumologic"), "1.0.0") + se2, err := newSumologicExtension(cfg2, logger2, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) t.Cleanup(func() { require.NoError(t, se2.Shutdown(context.Background())) }) fileName2, err := credentials.HashKeyToFilename(createHashKey(cfg2)) @@ -553,7 +554,7 @@ func TestRegisterEmptyCollectorName(t *testing.T) { cfg.Credentials.InstallationToken = "dummy_install_token" cfg.CollectorCredentialsDirectory = dir - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, err) @@ -641,7 +642,7 @@ func TestRegisterEmptyCollectorNameForceRegistration(t *testing.T) { cfg.CollectorCredentialsDirectory = dir cfg.ForceRegistration = true - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, se.Shutdown(context.Background())) @@ -650,7 +651,7 @@ func TestRegisterEmptyCollectorNameForceRegistration(t *testing.T) { colCreds, err := se.credentialsStore.Get(se.hashKey) require.NoError(t, err) colName := colCreds.CollectorName - se, err = newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err = newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) assert.Equal(t, se.collectorName, colName) @@ -714,7 +715,7 @@ func TestCollectorSendsBasicAuthHeadersOnRegistration(t *testing.T) { cfg.Credentials.InstallationToken = "dummy_install_token" cfg.CollectorCredentialsDirectory = dir - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) require.NoError(t, se.Shutdown(context.Background())) @@ -1008,7 +1009,7 @@ func TestCollectorCheckingCredentialsFoundInLocalStorage(t *testing.T) { logger, err := zap.NewDevelopment() require.NoError(t, err) - se, err := newSumologicExtension(cfg, logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) @@ -1097,7 +1098,7 @@ func TestRegisterEmptyCollectorNameWithBackoff(t *testing.T) { cfg.BackOff.InitialInterval = time.Millisecond cfg.BackOff.MaxInterval = time.Millisecond - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) require.Equal(t, hostname, se.collectorName) @@ -1147,7 +1148,7 @@ func TestRegisterEmptyCollectorNameUnrecoverableError(t *testing.T) { cfg.BackOff.InitialInterval = time.Millisecond cfg.BackOff.MaxInterval = time.Millisecond - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.EqualError(t, se.Start(context.Background(), componenttest.NewNopHost()), "collector registration failed: failed to register the collector, got HTTP status code: 404") @@ -1252,7 +1253,7 @@ func TestRegistrationRedirect(t *testing.T) { require.NoError(t, err) t.Run("works correctly", func(t *testing.T) { - se, err := newSumologicExtension(configFn(), logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(configFn(), logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) assert.Eventually(t, func() bool { return atomic.LoadInt32(&origReqCount) == 1 }, @@ -1267,7 +1268,7 @@ func TestRegistrationRedirect(t *testing.T) { }) t.Run("credentials store retrieves credentials with redirected api url", func(t *testing.T) { - se, err := newSumologicExtension(configFn(), logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(configFn(), logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) @@ -1364,7 +1365,7 @@ func TestCollectorReregistersAfterHTTPUnathorizedFromHeartbeat(t *testing.T) { logger, err := zap.NewDevelopment() require.NoError(t, err) - se, err := newSumologicExtension(cfg, logger, component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, logger, component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) @@ -1456,7 +1457,7 @@ func TestRegistrationRequestPayload(t *testing.T) { } cfg.TimeZone = "PST" - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) require.NoError(t, se.Start(context.Background(), componenttest.NewNopHost())) require.Equal(t, hostname, se.collectorName) @@ -1467,7 +1468,7 @@ func TestRegistrationRequestPayload(t *testing.T) { func TestWatchCredentialKey(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Credentials.InstallationToken = "dummy_install_token" - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) ctx := context.Background() @@ -1494,7 +1495,7 @@ func TestWatchCredentialKey(t *testing.T) { func TestCreateCredentialsHeader(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Credentials.InstallationToken = "dummy_install_token" - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) _, err = se.CreateCredentialsHeader() @@ -1562,7 +1563,7 @@ func TestUpdateMetadataRequestPayload(t *testing.T) { cfg.DiscoverCollectorTags = true cfg.TimeZone = "PST" - se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID("sumologic"), "1.0.0") + se, err := newSumologicExtension(cfg, zap.NewNop(), component.NewID(metadata.Type), "1.0.0") require.NoError(t, err) httpClient, err := se.getHTTPClient(se.conf.ClientConfig, api.OpenRegisterResponsePayload{}) diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index 0d4e85c447af..eee62959130e 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -8,16 +8,16 @@ require ( github.com/mitchellh/go-ps v1.0.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -52,14 +52,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.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index b6734322dd58..dd4d9b5fdff0 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -102,36 +102,36 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -190,8 +190,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/extension/sumologicextension/internal/metadata/generated_status.go b/extension/sumologicextension/internal/metadata/generated_status.go index 6a5f54d7cff1..d74258369567 100644 --- a/extension/sumologicextension/internal/metadata/generated_status.go +++ b/extension/sumologicextension/internal/metadata/generated_status.go @@ -13,7 +13,7 @@ var ( ) const ( - ExtensionStability = component.StabilityLevelDevelopment + ExtensionStability = component.StabilityLevelAlpha ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/extension/sumologicextension/metadata.yaml b/extension/sumologicextension/metadata.yaml index b538baea69af..0954bdbf67d4 100644 --- a/extension/sumologicextension/metadata.yaml +++ b/extension/sumologicextension/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/sumologic status: class: extension stability: - development: [extension] + alpha: [extension] distributions: [sumo] codeowners: active: [astencel-sumo, sumo-drosiek, swiatekm-sumo] diff --git a/go.mod b/go.mod index 94744bd9df80..38746a8df357 100644 --- a/go.mod +++ b/go.mod @@ -166,27 +166,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.96.0 - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 ) require ( - bitbucket.org/atlassian/go-asap/v2 v2.7.0 // indirect - cloud.google.com/go v0.112.0 // indirect + bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect + cloud.google.com/go v0.112.1 // indirect cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect cloud.google.com/go/iam v1.1.6 // indirect @@ -194,12 +194,13 @@ require ( cloud.google.com/go/longrunning v0.5.5 // indirect cloud.google.com/go/monitoring v1.18.0 // indirect cloud.google.com/go/pubsub v1.36.2 // indirect - cloud.google.com/go/spanner v1.57.0 // indirect + cloud.google.com/go/spanner v1.60.0 // indirect cloud.google.com/go/trace v1.10.5 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/AthenZ/athenz v1.10.39 // indirect @@ -228,8 +229,8 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect - github.com/ClickHouse/ch-go v0.58.2 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.17.1 // indirect + github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.22.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.104 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.51.1-0.20240301173728-334e775e420a // indirect github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel // indirect @@ -262,14 +263,14 @@ require ( github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect - github.com/SAP/go-hdb v1.8.5 // indirect + github.com/SAP/go-hdb v1.8.11 // indirect github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.70 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.71 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect @@ -277,25 +278,26 @@ require ( github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.50.27 // indirect - github.com/aws/aws-sdk-go-v2 v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.4 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect github.com/aws/smithy-go v1.20.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -314,7 +316,7 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect - github.com/coreos/go-oidc v2.2.1+incompatible // indirect + github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cskr/pubsub v1.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect @@ -324,8 +326,8 @@ require ( github.com/devigned/tab v0.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/digitalocean/godo v1.104.1 // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.9+incompatible // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/docker v25.0.4+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -349,7 +351,8 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-faster/city v1.0.1 // indirect - github.com/go-faster/errors v0.6.1 // indirect + github.com/go-faster/errors v0.7.1 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -360,7 +363,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect + github.com/go-sql-driver/mysql v1.8.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/go-zookeeper/zk v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect @@ -378,10 +381,10 @@ require ( github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/cadvisor v0.48.1 // indirect + github.com/google/cadvisor v0.49.1 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -390,7 +393,7 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gophercloud/gophercloud v1.7.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -428,14 +431,14 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.0 // indirect + github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgtype v1.14.0 // indirect - github.com/jackc/pgx/v4 v4.18.1 // indirect - github.com/jaegertracing/jaeger v1.54.0 // indirect + github.com/jackc/pgx/v4 v4.18.3 // indirect + github.com/jaegertracing/jaeger v1.55.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect @@ -543,7 +546,7 @@ require ( github.com/outcaste-io/ristretto v0.2.1 // indirect github.com/ovh/go-ovh v1.4.3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/paulmach/orb v0.10.0 // indirect + github.com/paulmach/orb v0.11.1 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -556,9 +559,9 @@ require ( github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect 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.5.1 // indirect @@ -577,7 +580,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/sapm-proto v0.14.0 // indirect - github.com/sijms/go-ora/v2 v2.8.8 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -608,7 +611,7 @@ require ( github.com/vishvananda/netlink v1.2.1-beta.2 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e // indirect - github.com/vmware/govmomi v0.35.0 // indirect + github.com/vmware/govmomi v0.36.1 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect @@ -621,33 +624,33 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.49.0 // indirect @@ -681,28 +684,27 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/api v0.166.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect + google.golang.org/api v0.170.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect gotest.tools/v3 v3.5.0 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect - k8s.io/client-go v0.29.2 // indirect - k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect + k8s.io/client-go v0.29.3 // indirect + k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.2 // indirect + k8s.io/kubelet v0.29.3 // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/controller-runtime v0.17.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -1150,3 +1152,7 @@ replace ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ./internal/sqlquery + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ./extension/encoding + +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ./extension/encoding/otlpencodingextension diff --git a/go.sum b/go.sum index f792de357c1a..a8bad0301d48 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -bitbucket.org/atlassian/go-asap/v2 v2.7.0 h1:TKL1UN1rAJzHM4/8eURzFwdE3K6TEl/EN9XtahvqYX0= -bitbucket.org/atlassian/go-asap/v2 v2.7.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= +bitbucket.org/atlassian/go-asap/v2 v2.8.0 h1:JL4jktrZT3H8GHkkeJ1RCdhJ5YcOyVccA/2TJ4ae3I0= +bitbucket.org/atlassian/go-asap/v2 v2.8.0/go.mod h1:cuRgWb7eeGtsocKmqY2kPlMMlwpkeNh+QOIkjAMlUBc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -20,8 +20,8 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= -cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= +cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= +cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -49,8 +49,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.2 h1:nAUD4aiWHZFYyINhRag1qOnHUk0/7QiWEa04XWnqACA= cloud.google.com/go/pubsub v1.36.2/go.mod h1:mHCFLNG8abCrPzhuOnpBcr9DUy+l3/LWWn0qoJdbh1w= -cloud.google.com/go/spanner v1.57.0 h1:fJq+ZfQUDHE+cy1li0bJA8+sy2oiSGhuGqN5nqVaZdU= -cloud.google.com/go/spanner v1.57.0/go.mod h1:aXQ5QDdhPRIqVhYmnkAdwPYvj/DRN0FguclhEWw+jOo= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -70,6 +70,8 @@ code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78/go.mod h1:tkZo8 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= @@ -157,10 +159,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= -github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1 h1:ZCmAYWpu75IyEi7+Yrs/uaAjiCGY5wfW5kXo64exkX4= -github.com/ClickHouse/clickhouse-go/v2 v2.17.1/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ= +github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= +github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2 h1:T1BljsIjj+3aQog80jKMTeF4EqAUG4P6TVcCvmakYAc= +github.com/ClickHouse/clickhouse-go/v2 v2.22.2/go.mod h1:tBhdF3f3RdP7sS59+oBAtTyhWpy0024ZxDMhgxra0QE= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/agent-payload/v5 v5.0.104 h1:uxTIaLthyKB4CxBKe+2FeMgL6ca3KVxpeYxlJGNcoJg= @@ -246,8 +248,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= @@ -300,12 +302,12 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.1 h1:K6kwgo+UiYx+/kr6CO0PN5ACZDzE3n github.com/alibabacloud-go/tea-utils/v2 v2.0.1/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= github.com/alibabacloud-go/tea-xml v1.1.2 h1:oLxa7JUXm2EDFzMg+7oRsYc+kutgCVwm+bZlhhmvW5M= github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/aliyun-log-go-sdk v0.1.70 h1:UUYesP5PL3kps6RuqpGwCbXylDWB54urJfXnp5qKJWM= -github.com/aliyun/aliyun-log-go-sdk v0.1.70/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= +github.com/aliyun/aliyun-log-go-sdk v0.1.71 h1:0zC74BgKUhmCDrrUArsjQD/igfNyAnc2vyuu9zLNRAc= +github.com/aliyun/aliyun-log-go-sdk v0.1.71/go.mod h1:FSKcIjukUy+LeUKhRk13PCO+9gPMTfGsYhFBHQbDqmM= github.com/aliyun/credentials-go v1.1.2 h1:qU1vwGIBb3UJ8BwunHDRFtAhS6jnQLnde/yk0+Ih2GY= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= @@ -340,33 +342,33 @@ github.com/aws/aws-sdk-go v1.50.27/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3Tj github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.25.2 h1:/uiG1avJRgLGiQM9X3qJM8+Qa6KRGK5rRPuXE0HUM+w= -github.com/aws/aws-sdk-go-v2 v1.25.2/go.mod h1:Evoc5AsmtveRt1komDwIsjHFyrP5tDuF1D1U+6z6pNo= +github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0= +github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo= github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/config v1.27.4 h1:AhfWb5ZwimdsYTgP7Od8E9L1u4sKmDW2ZVeLcf2O42M= -github.com/aws/aws-sdk-go-v2/config v1.27.4/go.mod h1:zq2FFXK3A416kiukwpsd+rD4ny6JC7QSkp4QdN1Mp2g= +github.com/aws/aws-sdk-go-v2/config v1.27.7 h1:JSfb5nOQF01iOgxFI5OIKWwDiEXWTyTgg1Mm1mHi0A4= +github.com/aws/aws-sdk-go-v2/config v1.27.7/go.mod h1:PH0/cNpoMO+B04qET699o5W92Ca79fVtbUnvMIZro4I= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4 h1:h5Vztbd8qLppiPwX+y0Q6WiwMZgpd9keKe2EAENgAuI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.4/go.mod h1:+30tpwrkOgvkJL1rUZuRLoxcJwtI/OkeBLYnHxJtVe0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982SyVKOJD+K8HIezu4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 h1:AK0J8iYBFeUk2Ax7O8YpLtFsfhdOByh2QIkHmigpRYk= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2/go.mod h1:iRlGzMix0SExQEviAyptRWRGdYNo3+ufW/lCzvKVTUc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59 h1:E3Y+OfzOK1+rmRo/K2G0ml8Vs+Xqk0kOnf4nS0kUtBc= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.59/go.mod h1:1M4PLSBUVfBI0aP+C9XI7SM6kZPCGYyI6izWz0TGprE= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 h1:bNo4LagzUKbjdxE0tIcR9pMzLR2U/Tgie1Hq1HQ3iH8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2/go.mod h1:wRQv0nN6v9wDXuWThpovGQjqF1HFdcgWjporw14lS8k= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 h1:EtOU5jsPdIQNP+6Q2C5e3d65NKT1PeCiQk+9OdzO12Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2/go.mod h1:tyF5sKccmDz0Bv4NrstEr+/9YkSPJHrcO7UsUKf7pWM= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= @@ -380,26 +382,28 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 h1:CeuSeq/8FnYpPt github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26/go.mod h1:2UqAAwMUXKeRkAHIlDJqvMVgOWkUi/AUXPk/YIe+Dg4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 h1:5ffmXjPtwRExp1zc7gENLgCPyHFbhEPwVTkTiH9niSk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2/go.mod h1:Ru7vg1iQ7cR4i7SZ/JTLYN9kaXtbL69UdgG0OQWQxW0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 h1:e2ooMhpYGhDnBfSvIyusvAwX7KexuZaHbQY2Dyei7VU= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0/go.mod h1:bh2E0CXKZsQN+faiKVqC40vfNMAWheoULBCnEgO9K+8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1 h1:p8dOJ/UKXOwttc1Cxw1Ek52klVmMuiaCUkhsUGxce1I= github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.1/go.mod h1:VpH1IBG1YYZHPu5qShNt7EGaqUQbHAJZrbDtEpqDvvY= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 h1:B1G2pSPvbAtQjilPq+Y7jLIzCOwKzuVEl+aBBaNG0AQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0/go.mod h1:ncltU6n4Nof5uJttDtcNQ537uNuwYqsZZQcpkd2/GUQ= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2 h1:BdhnpGGsss5D70eA9WUDvK65HiPx0vyPmh+Tmh2Ue7U= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.2/go.mod h1:zTbnRWj5oiNEAl7Vh0Gtr03gywl5R/qdDR8z2BmV7ns= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 h1:utEGkfdQ4L6YW/ietH7111ZYglLJvS+sLriHJ1NBJEQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.1/go.mod h1:RsYqzYr2F2oPDdpy+PdhephuZxTfjHQe7SOBcZGoAU8= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 h1:9/GylMS45hGGFCcMrUZDVayQE1jYSIN6da9jo7RAYIw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1/go.mod h1:YjAPFn4kGFqKC54VsHs5fn5B6d+PCY2tziEa3U/GB5Y= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2/go.mod h1:JYzLoEVeLXk+L4tn1+rrkfhkxl6mLDEVaDSvGq9og90= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 h1:3I2cBEYgKhrWlwyZgfpSO2BpaMY1LHPqXYk/QGlu2ew= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.1/go.mod h1:uQ7YYKZt3adCRrdCBREm1CD3efFLOUNH77MrUCvx5oA= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB2RnnQdguhXpmeQk= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= @@ -477,16 +481,16 @@ github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKk github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= -github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= +github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -530,12 +534,12 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8= +github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -625,11 +629,13 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= -github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI= -github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -647,7 +653,6 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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= @@ -676,8 +681,8 @@ github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPr github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -758,8 +763,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -769,8 +774,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/cadvisor v0.48.1 h1:eyYTxKBd+KxI1kh6rst4JSTLUhfHQM34qGpp+0AMlSg= -github.com/google/cadvisor v0.48.1/go.mod h1:ZkYbiiVdyoqBmI2ahZI8GlmirT78OAOER0z4EQugkxQ= +github.com/google/cadvisor v0.49.1 h1:9M++63nWvdq6Oci6wUDuAfQNTZpuz1ZObln0Bhs9xN0= +github.com/google/cadvisor v0.49.1/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -826,8 +831,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= @@ -988,8 +993,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= -github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= -github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= @@ -1005,8 +1010,8 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= -github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= @@ -1020,14 +1025,13 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= -github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= @@ -1050,6 +1054,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -1214,6 +1220,8 @@ github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vyg github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1325,8 +1333,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s= -github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -1391,8 +1399,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1401,8 +1409,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1415,8 +1423,8 @@ github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH 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= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -1462,8 +1470,8 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REP github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= github.com/signalfx/sapm-proto v0.14.0 h1:KWh3I5E4EkelB19aP1/54Ik8khSioC/RVRW/riOfRGg= github.com/signalfx/sapm-proto v0.14.0/go.mod h1:Km6PskZh966cqNoUn3AmRyGRix5VfwnxVBvn2vjRC9U= -github.com/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1537,8 +1545,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857 h1:6TxCHz3zSG67cLDDu8w3TkFm/FwiyiAWBhcidGXWH/0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.857/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= -github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk= -github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U= +github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8= +github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU= github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6BY= github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -1586,8 +1594,8 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e h1:Vu41Q0Pv3yMdd+tcDW6QeEUIK2L+9ZrPrq8NAMrKSLc= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aRq5pxwgdJpAuP97SCjX1+Db32z/b0dggQ07FDF+fqE= -github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0= -github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY= +github.com/vmware/govmomi v0.36.1 h1:+E/nlfteQ8JvC0xhuKAfpnMsuIeGeGj7rJwqENUcWm8= +github.com/vmware/govmomi v0.36.1/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -1645,92 +1653,92 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a h1:pv7jzJUXo1wx1lpqLBjyvMPZ49MaY2FJzRPvzhCcyQM= -go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:DzYm9k0mVbvmGKTKxqCyRyRYxNofVCMLS8CKn8DvLpg= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:RyAPd9frTtdmq/tkAKgW0kj9Eju8vapui0otxzFA+Sk= -go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2cZadfyG1PH9V4WghncyZGAPTPgjUDmnmNyS5dKf9pw= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:7jHwA6IoBYR8p5ltqNm/hZUMgXHeL3Y8hXjsTe0XN+8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cwNkIhOcU9ltYj7Xrrn9/6+j6XZC8hMZcXU8/J0DzeE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a h1:4uN68N5k2JQkGJm2P1NHlX3rSWBAnpBpO03xO6dy58k= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:te/gJxX/rw7VYnXxmV4qjUv8YYeL1YNCAxgAI92sZoU= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a h1:3idLe4piHkcyEb6j7XyDfSxmScI0nhe5O/Wa/Molnkk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:PWKLpwkarM7db/ho+fF+X8ynke3EFiXfGXdDiCmKMPw= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:xBJ42Nn4e6QuaflVWgLINTESCRRZnOfX0taiuoDsgjw= +go.opentelemetry.io/collector/connector/forwardconnector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vDiwu5V3Gsqp19NtWfixZyXnT/V++Nko/xQmJz8mvJc= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:GgPvWGYWmY4+LPKRxz6q7UPRbcRscQQNXJZQ8GryY6s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PHw6sVRsSCdGBRs032Mf8PxNqZgNJ0fVBBLtpWCdx0A= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -2165,8 +2173,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2190,8 +2198,8 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2247,10 +2255,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= -google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2277,8 +2285,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -2321,8 +2329,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -2354,27 +2360,27 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/internal/aws/awsutil/go.mod b/internal/aws/awsutil/go.mod index 0327b5c50612..be87ce447fd6 100644 --- a/internal/aws/awsutil/go.mod +++ b/internal/aws/awsutil/go.mod @@ -7,7 +7,7 @@ require ( github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - golang.org/x/net v0.21.0 + golang.org/x/net v0.22.0 ) require ( diff --git a/internal/aws/awsutil/go.sum b/internal/aws/awsutil/go.sum index 92ad14816f8c..13c2f787a616 100644 --- a/internal/aws/awsutil/go.sum +++ b/internal/aws/awsutil/go.sum @@ -26,8 +26,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 53baa9128eca..a24b687736e9 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -22,7 +22,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index fe0b4dc2cfa7..30346de5889e 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -33,8 +33,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -74,8 +74,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 6df2081f86dc..aad66d23a2a4 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.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.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -34,7 +34,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 42246bd10fae..3aae1cbd76a8 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -48,14 +48,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -101,8 +101,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 897fa6734972..5ef7ace84d5a 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -36,18 +36,18 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -60,7 +60,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 9d84a494c68e..c5fb0462dcb8 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -69,36 +69,36 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -152,8 +152,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/aws/k8s/go.mod b/internal/aws/k8s/go.mod index 069d92147db0..46e205833e05 100644 --- a/internal/aws/k8s/go.mod +++ b/internal/aws/k8s/go.mod @@ -7,9 +7,9 @@ require ( github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -21,7 +21,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -45,7 +45,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/aws/k8s/go.sum b/internal/aws/k8s/go.sum index d2837fc8c379..da27570713a8 100644 --- a/internal/aws/k8s/go.sum +++ b/internal/aws/k8s/go.sum @@ -21,12 +21,10 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4 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.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.5/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= @@ -137,10 +135,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -152,12 +148,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/internal/aws/proxy/cfg.go b/internal/aws/proxy/cfg.go index c6a1fc966620..2d352d58f742 100644 --- a/internal/aws/proxy/cfg.go +++ b/internal/aws/proxy/cfg.go @@ -23,7 +23,7 @@ type Config struct { // TLSSetting struct exposes TLS client configuration when forwarding // calls to the AWS X-Ray backend. - TLSSetting configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLSSetting configtls.ClientConfig `mapstructure:"tls,omitempty"` // Region is the AWS region the local TCP server forwards requests to. Region string `mapstructure:"region"` @@ -40,6 +40,10 @@ type Config struct { // will be called or not. Set to `true` to skip EC2 instance // metadata check. LocalMode bool `mapstructure:"local_mode"` + + // ServiceName determines which service the requests are sent to. + // will be default to `xray`. This is mandatory for SigV4 + ServiceName string `mapstructure:"service_name"` } func DefaultConfig() *Config { @@ -48,12 +52,13 @@ func DefaultConfig() *Config { Endpoint: localhostgate.EndpointForPort(2000), }, ProxyAddress: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, ServerName: "", }, Region: "", RoleARN: "", AWSEndpoint: "", + ServiceName: "xray", } } diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 270ecbde7c52..4980ed59b56b 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.27 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.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 v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // 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 ab3876512981..5a35be9905cf 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -34,16 +34,16 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= 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/proxy/server.go b/internal/aws/proxy/server.go index 8a78fdcde8a8..4b15762f30fb 100644 --- a/internal/aws/proxy/server.go +++ b/internal/aws/proxy/server.go @@ -25,7 +25,6 @@ import ( ) const ( - service = "xray" connHeader = "Connection" ) @@ -45,13 +44,16 @@ func NewServer(cfg *Config, logger *zap.Logger) (Server, error) { if cfg.ProxyAddress != "" { logger.Debug("Using remote proxy", zap.String("address", cfg.ProxyAddress)) } + if cfg.ServiceName == "" { + cfg.ServiceName = "xray" + } awsCfg, sess, err := getAWSConfigSession(cfg, logger) if err != nil { return nil, err } - awsEndPoint, err := getServiceEndpoint(awsCfg) + awsEndPoint, err := getServiceEndpoint(awsCfg, cfg.ServiceName) if err != nil { return nil, err } @@ -101,7 +103,7 @@ func NewServer(cfg *Config, logger *zap.Logger) (Server, error) { } // Sign request. signer.Sign() also repopulates the request body. - _, err = signer.Sign(req, body, service, *awsCfg.Region, time.Now()) + _, err = signer.Sign(req, body, cfg.ServiceName, *awsCfg.Region, time.Now()) if err != nil { logger.Error("Unable to sign request", zap.Error(err)) } @@ -117,13 +119,13 @@ func NewServer(cfg *Config, logger *zap.Logger) (Server, error) { // getServiceEndpoint returns X-Ray service endpoint. // It is guaranteed that awsCfg config instance is non-nil and the region value is non nil or non empty in awsCfg object. -// Currently the caller takes care of it. -func getServiceEndpoint(awsCfg *aws.Config) (string, error) { +// Currently, the caller takes care of it. +func getServiceEndpoint(awsCfg *aws.Config, serviceName string) (string, error) { if isEmpty(awsCfg.Endpoint) { if isEmpty(awsCfg.Region) { return "", errors.New("unable to generate endpoint from region with nil value") } - resolved, err := endpoints.DefaultResolver().EndpointFor(service, *awsCfg.Region, setResolverConfig()) + resolved, err := endpoints.DefaultResolver().EndpointFor(serviceName, *awsCfg.Region, setResolverConfig()) return resolved.URL, err } return *awsCfg.Endpoint, nil diff --git a/internal/aws/proxy/server_test.go b/internal/aws/proxy/server_test.go index 7bff20df8e63..a869cf851f27 100644 --- a/internal/aws/proxy/server_test.go +++ b/internal/aws/proxy/server_test.go @@ -241,7 +241,7 @@ func TestCanCreateTransport(t *testing.T) { } func TestGetServiceEndpointInvalidAWSConfig(t *testing.T) { - _, err := getServiceEndpoint(&aws.Config{}) + _, err := getServiceEndpoint(&aws.Config{}, "") assert.EqualError(t, err, "unable to generate endpoint from region with nil value") } diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index 35d93b67c258..24a187a01ed5 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.27 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -24,18 +24,18 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/aws/xray/go.sum b/internal/aws/xray/go.sum index c3188e5d536a..6c3ef4f719d5 100644 --- a/internal/aws/xray/go.sum +++ b/internal/aws/xray/go.sum @@ -48,14 +48,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -77,16 +77,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -101,8 +101,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/aws/xray/testdata/sampleapp/go.mod b/internal/aws/xray/testdata/sampleapp/go.mod index e7ae7ab66a7a..a76c728cf6fa 100644 --- a/internal/aws/xray/testdata/sampleapp/go.mod +++ b/internal/aws/xray/testdata/sampleapp/go.mod @@ -21,7 +21,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/internal/aws/xray/testdata/sampleapp/go.sum b/internal/aws/xray/testdata/sampleapp/go.sum index f2a1b720854b..1e6d701a121f 100644 --- a/internal/aws/xray/testdata/sampleapp/go.sum +++ b/internal/aws/xray/testdata/sampleapp/go.sum @@ -47,8 +47,8 @@ google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/internal/aws/xray/testdata/sampleserver/go.mod b/internal/aws/xray/testdata/sampleserver/go.mod index cfbf574a39d1..e7642c084d77 100644 --- a/internal/aws/xray/testdata/sampleserver/go.mod +++ b/internal/aws/xray/testdata/sampleserver/go.mod @@ -19,7 +19,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) retract ( diff --git a/internal/aws/xray/testdata/sampleserver/go.sum b/internal/aws/xray/testdata/sampleserver/go.sum index 8a7be4babc22..42be39af6ce5 100644 --- a/internal/aws/xray/testdata/sampleserver/go.sum +++ b/internal/aws/xray/testdata/sampleserver/go.sum @@ -47,8 +47,8 @@ google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/common/go.mod b/internal/common/go.mod index cc8780bb4085..3ec119d0fec6 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 1c9831b6343a..75fa19492f4a 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -12,8 +12,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= 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 deea2791b940..d1565e80c088 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -72,14 +72,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -90,7 +90,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index e696dffe696a..df5e76aca757 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,26 +142,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -209,7 +209,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -230,8 +229,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/datadog/agent.go b/internal/datadog/agent.go index fef56516823d..7bba14cad2cf 100644 --- a/internal/datadog/agent.go +++ b/internal/datadog/agent.go @@ -19,7 +19,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/trace/timing" "github.com/DataDog/datadog-go/v5/statsd" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" - "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -38,13 +37,6 @@ type TraceAgent struct { exit chan struct{} } -var _ = featuregate.GlobalRegistry().MustRegister( - "connector.datadogconnector.performance", - featuregate.StageStable, - featuregate.WithRegisterDescription("Datadog Connector will use optimized code"), - featuregate.WithRegisterToVersion("0.97.0"), -) - // newAgent creates a new unstarted traceagent using the given context. Call Start to start the traceagent. // The out channel will receive outoing stats payloads resulting from spans ingested using the Ingest method. func NewAgent(ctx context.Context, out chan *pb.StatsPayload, metricsClient statsd.ClientInterface, timingReporter timing.Reporter) *TraceAgent { diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index e6384ec46c9f..85c139e3b1dd 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -9,9 +9,8 @@ require ( github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.4 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.4 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -46,7 +45,6 @@ require ( github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -75,9 +73,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/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -92,7 +90,7 @@ require ( golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index e895e969ebcf..100778a952bb 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -85,8 +85,6 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/go-version v1.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/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -186,18 +184,16 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -282,8 +278,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/internal/docker/docker.go b/internal/docker/docker.go index 102a727426ab..55682adaa4e4 100644 --- a/internal/docker/docker.go +++ b/internal/docker/docker.go @@ -236,16 +236,16 @@ EVENT_LOOP: case event := <-eventCh: switch event.Action { case "destroy": - dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.ID)) - dc.RemoveContainer(event.ID) + dc.logger.Debug("Docker container was destroyed:", zap.String("id", event.Actor.ID)) + dc.RemoveContainer(event.Actor.ID) default: dc.logger.Debug( "Docker container update:", - zap.String("id", event.ID), - zap.String("action", event.Action), + zap.String("id", event.Actor.ID), + zap.Any("action", event.Action), ) - dc.InspectAndPersistContainer(ctx, event.ID) + dc.InspectAndPersistContainer(ctx, event.Actor.ID) } if event.TimeNano > lastTime.UnixNano() { diff --git a/internal/exp/metrics/go.mod b/internal/exp/metrics/go.mod index 04174cf8f762..9d47dba50855 100644 --- a/internal/exp/metrics/go.mod +++ b/internal/exp/metrics/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) require ( @@ -22,7 +22,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/exp/metrics/go.sum b/internal/exp/metrics/go.sum index a24a7ce3e699..4abd423cfe53 100644 --- a/internal/exp/metrics/go.sum +++ b/internal/exp/metrics/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -74,8 +74,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/exp/metrics/staleness/staleness.go b/internal/exp/metrics/staleness/staleness.go index 9e5f989495f8..4bf25c198920 100644 --- a/internal/exp/metrics/staleness/staleness.go +++ b/internal/exp/metrics/staleness/staleness.go @@ -13,6 +13,11 @@ import ( // We override how Now() is returned, so we can have deterministic tests var NowFunc = time.Now +var ( + _ streams.Map[any] = (*Staleness[any])(nil) + _ streams.Evictor = (*Staleness[any])(nil) +) + // Staleness a a wrapper over a map that adds an additional "staleness" value to each entry. Users can // call ExpireOldEntries() to automatically remove all entries from the map whole staleness value is // older than the `max` @@ -82,3 +87,9 @@ func (s *Staleness[T]) Next() time.Time { _, ts := s.pq.Peek() return ts } + +func (s *Staleness[T]) Evict() identity.Stream { + id, _ := s.pq.Pop() + s.items.Delete(id) + return id +} diff --git a/internal/exp/metrics/streams/streams.go b/internal/exp/metrics/streams/streams.go index 1e25102b3b47..90bebb63c091 100644 --- a/internal/exp/metrics/streams/streams.go +++ b/internal/exp/metrics/streams/streams.go @@ -50,3 +50,9 @@ func (m HashMap[T]) Items() func(yield func(identity.Stream, T) bool) bool { func (m HashMap[T]) Len() int { return len((map[identity.Stream]T)(m)) } + +// Evictors remove the "least important" stream based on some strategy such as +// the oldest, least active, etc. +type Evictor interface { + Evict() identity.Stream +} diff --git a/internal/filter/filterconfig/config.go b/internal/filter/filterconfig/config.go index 4f77f99fe65f..eb0f2a53191f 100644 --- a/internal/filter/filterconfig/config.go +++ b/internal/filter/filterconfig/config.go @@ -105,8 +105,7 @@ type MatchProperties struct { MetricNames []string `mapstructure:"metric_names"` // Attributes specifies the list of attributes to match against. - // All of these attributes must match exactly for a match to occur. - // Only match_type=strict is allowed if "attributes" are specified. + // All of these attributes must match for a match to occur. // This is an optional field. Attributes []Attribute `mapstructure:"attributes"` diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 43b9fa55d9a3..eeb657dc2de1 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -45,7 +45,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect @@ -58,7 +58,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/filter/go.sum b/internal/filter/go.sum index 0e8e1673eb63..0f63cb064ac9 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -82,18 +82,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -147,8 +147,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/k8sconfig/go.mod b/internal/k8sconfig/go.mod index fdebd12b89bb..92e07cde0705 100644 --- a/internal/k8sconfig/go.mod +++ b/internal/k8sconfig/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -16,7 +16,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect @@ -36,11 +36,11 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/internal/k8sconfig/go.sum b/internal/k8sconfig/go.sum index 58f60136fc1f..05975d6f106c 100644 --- a/internal/k8sconfig/go.sum +++ b/internal/k8sconfig/go.sum @@ -101,9 +101,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -114,7 +113,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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.2/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.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= @@ -450,10 +448,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.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-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -482,14 +478,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/k8stest/client.go b/internal/k8stest/client.go new file mode 100644 index 000000000000..8481b37d62b9 --- /dev/null +++ b/internal/k8stest/client.go @@ -0,0 +1,46 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" + +import ( + "errors" + "fmt" + + "k8s.io/client-go/discovery" + memory "k8s.io/client-go/discovery/cached" + "k8s.io/client-go/dynamic" + "k8s.io/client-go/restmapper" + "k8s.io/client-go/tools/clientcmd" +) + +type K8sClient struct { + DynamicClient *dynamic.DynamicClient + DiscoveryClient *discovery.DiscoveryClient + Mapper *restmapper.DeferredDiscoveryRESTMapper +} + +func NewK8sClient(kubeconfigPath string) (*K8sClient, error) { + + if kubeconfigPath == "" { + return nil, errors.New("Please provide file path to load kubeconfig") + } + restConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath) + if err != nil { + return nil, fmt.Errorf("unable to load kubeconfig from %s: %w", kubeconfigPath, err) + } + + dynamicClient, err := dynamic.NewForConfig(restConfig) + if err != nil { + return nil, fmt.Errorf("error creating dynamic client: %w", err) + } + + discoveryClient, err := discovery.NewDiscoveryClientForConfig(restConfig) + if err != nil { + return nil, fmt.Errorf("error creating discovery client: %w", err) + } + + mapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(discoveryClient)) + return &K8sClient{ + DynamicClient: dynamicClient, DiscoveryClient: discoveryClient, Mapper: mapper}, nil +} diff --git a/internal/k8stest/go.mod b/internal/k8stest/go.mod index 82bb6f7d7a7e..200696a6da3a 100644 --- a/internal/k8stest/go.mod +++ b/internal/k8stest/go.mod @@ -5,9 +5,9 @@ go 1.21 require ( github.com/docker/docker v24.0.9+incompatible github.com/stretchr/testify v1.9.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -16,19 +16,30 @@ require ( github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/go-logr/logr v1.3.0 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/imdario/mergo v0.3.6 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/morikuni/aec v1.0.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect @@ -38,12 +49,13 @@ require ( golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.4.0 // indirect k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/internal/k8stest/go.sum b/internal/k8stest/go.sum index e3b9698a9e09..39d545b0519d 100644 --- a/internal/k8stest/go.sum +++ b/internal/k8stest/go.sum @@ -2,6 +2,7 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -15,6 +16,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -23,12 +26,13 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= 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.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -38,16 +42,23 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/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/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -63,6 +74,10 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= @@ -78,7 +93,12 @@ github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs 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.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -132,10 +152,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -144,16 +162,17 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/internal/k8stest/k8s_collector.go b/internal/k8stest/k8s_collector.go index 0530e9caeac3..d607fd194e1a 100644 --- a/internal/k8stest/k8s_collector.go +++ b/internal/k8stest/k8s_collector.go @@ -18,11 +18,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/dynamic" ) -func CreateCollectorObjects(t *testing.T, client *dynamic.DynamicClient, testID string) []*unstructured.Unstructured { - manifestsDir := filepath.Join(".", "testdata", "e2e", "collector") +func CreateCollectorObjects(t *testing.T, client *K8sClient, testID string, manifestsDir string) []*unstructured.Unstructured { + if manifestsDir == "" { + manifestsDir = filepath.Join(".", "testdata", "e2e", "collector") + } manifestFiles, err := os.ReadDir(manifestsDir) require.NoErrorf(t, err, "failed to read collector manifests directory %s", manifestsDir) host := HostEndpoint(t) @@ -35,6 +36,7 @@ func CreateCollectorObjects(t *testing.T, client *dynamic.DynamicClient, testID require.NoError(t, tmpl.Execute(manifest, map[string]string{ "Name": "otelcol-" + testID, "HostEndpoint": host, + "TestID": testID, })) obj, err := CreateObject(client, manifest.Bytes()) require.NoErrorf(t, err, "failed to create collector object from manifest %s", manifestFile.Name()) @@ -52,13 +54,13 @@ func CreateCollectorObjects(t *testing.T, client *dynamic.DynamicClient, testID return createdObjs } -func WaitForCollectorToStart(t *testing.T, client *dynamic.DynamicClient, podNamespace string, podLabels map[string]any) { +func WaitForCollectorToStart(t *testing.T, client *K8sClient, podNamespace string, podLabels map[string]any) { podGVR := schema.GroupVersionResource{Version: "v1", Resource: "pods"} listOptions := metav1.ListOptions{LabelSelector: SelectorFromMap(podLabels).String()} podTimeoutMinutes := 3 t.Logf("waiting for collector pods to be ready") require.Eventuallyf(t, func() bool { - list, err := client.Resource(podGVR).Namespace(podNamespace).List(context.Background(), listOptions) + list, err := client.DynamicClient.Resource(podGVR).Namespace(podNamespace).List(context.Background(), listOptions) require.NoError(t, err, "failed to list collector pods") podsNotReady := len(list.Items) if podsNotReady == 0 { diff --git a/internal/k8stest/k8s_objects.go b/internal/k8stest/k8s_objects.go index bbbff8d6e56b..bf4b559d0994 100644 --- a/internal/k8stest/k8s_objects.go +++ b/internal/k8stest/k8s_objects.go @@ -5,43 +5,51 @@ package k8stest // import "github.com/open-telemetry/opentelemetry-collector-con import ( "context" - "strings" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/yaml" "k8s.io/client-go/dynamic" ) -func CreateObject(client *dynamic.DynamicClient, manifest []byte) (*unstructured.Unstructured, error) { +func CreateObject(client *K8sClient, manifest []byte) (*unstructured.Unstructured, error) { decoder := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme) obj := &unstructured.Unstructured{} _, gvk, err := decoder.Decode(manifest, nil, obj) if err != nil { return nil, err } - gvr := schema.GroupVersionResource{ - Group: gvk.Group, - Version: gvk.Version, - Resource: strings.ToLower(gvk.Kind + "s"), + gvr, err := client.Mapper.RESTMapping(gvk.GroupKind(), gvk.Version) + if err != nil { + return nil, err } - return client.Resource(gvr).Namespace(obj.GetNamespace()).Create(context.Background(), obj, metav1.CreateOptions{}) + var resource dynamic.ResourceInterface + if gvr.Scope.Name() == meta.RESTScopeNameNamespace { + resource = client.DynamicClient.Resource(gvr.Resource).Namespace(obj.GetNamespace()) + } else { + // cluster-scoped resources + resource = client.DynamicClient.Resource(gvr.Resource) + } + + return resource.Create(context.Background(), obj, metav1.CreateOptions{}) } -func DeleteObject(client *dynamic.DynamicClient, obj *unstructured.Unstructured) error { +func DeleteObject(client *K8sClient, obj *unstructured.Unstructured) error { gvk := obj.GroupVersionKind() - gvr := schema.GroupVersionResource{ - Group: gvk.Group, - Version: gvk.Version, - Resource: strings.ToLower(gvk.Kind + "s"), + gvr, err := client.Mapper.RESTMapping(gvk.GroupKind(), gvk.Version) + if err != nil { + return err } - - options := metav1.DeleteOptions{} - policy := metav1.DeletePropagationBackground - if gvk.Kind == "Job" { - options.PropagationPolicy = &policy + var resource dynamic.ResourceInterface + if gvr.Scope.Name() == meta.RESTScopeNameNamespace { + resource = client.DynamicClient.Resource(gvr.Resource).Namespace(obj.GetNamespace()) + } else { + // cluster-scoped resources + resource = client.DynamicClient.Resource(gvr.Resource) } - - return client.Resource(gvr).Namespace(obj.GetNamespace()).Delete(context.Background(), obj.GetName(), options) + deletePolicy := metav1.DeletePropagationForeground + return resource.Delete(context.Background(), obj.GetName(), metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }) } diff --git a/internal/k8stest/k8s_telemetrygen.go b/internal/k8stest/k8s_telemetrygen.go index e9aed1a856e0..c620d499a333 100644 --- a/internal/k8stest/k8s_telemetrygen.go +++ b/internal/k8stest/k8s_telemetrygen.go @@ -16,7 +16,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/dynamic" ) type TelemetrygenObjInfo struct { @@ -26,26 +25,33 @@ type TelemetrygenObjInfo struct { Workload string } -func CreateTelemetryGenObjects(t *testing.T, client *dynamic.DynamicClient, testID string) ([]*unstructured.Unstructured, []*TelemetrygenObjInfo) { +type TelemetrygenCreateOpts struct { + TestID string + ManifestsDir string + OtlpEndpoint string + DataTypes []string +} + +func CreateTelemetryGenObjects(t *testing.T, client *K8sClient, createOpts *TelemetrygenCreateOpts) ([]*unstructured.Unstructured, []*TelemetrygenObjInfo) { telemetrygenObjInfos := make([]*TelemetrygenObjInfo, 0) - manifestsDir := filepath.Join(".", "testdata", "e2e", "telemetrygen") - manifestFiles, err := os.ReadDir(manifestsDir) - require.NoErrorf(t, err, "failed to read telemetrygen manifests directory %s", manifestsDir) + manifestFiles, err := os.ReadDir(createOpts.ManifestsDir) + require.NoErrorf(t, err, "failed to read telemetrygen manifests directory %s", createOpts.ManifestsDir) createdObjs := make([]*unstructured.Unstructured, 0, len(manifestFiles)) for _, manifestFile := range manifestFiles { - tmpl := template.Must(template.New(manifestFile.Name()).ParseFiles(filepath.Join(manifestsDir, manifestFile.Name()))) - for _, dataType := range []string{"metrics", "logs", "traces"} { + tmpl := template.Must(template.New(manifestFile.Name()).ParseFiles(filepath.Join(createOpts.ManifestsDir, manifestFile.Name()))) + for _, dataType := range createOpts.DataTypes { manifest := &bytes.Buffer{} require.NoError(t, tmpl.Execute(manifest, map[string]string{ - "Name": "telemetrygen-" + testID, + "Name": "telemetrygen-" + createOpts.TestID, "DataType": dataType, - "OTLPEndpoint": "otelcol-" + testID + ":4317", + "OTLPEndpoint": createOpts.OtlpEndpoint, + "TestID": createOpts.TestID, })) obj, err := CreateObject(client, manifest.Bytes()) require.NoErrorf(t, err, "failed to create telemetrygen object from manifest %s", manifestFile.Name()) selector := obj.Object["spec"].(map[string]any)["selector"] telemetrygenObjInfos = append(telemetrygenObjInfos, &TelemetrygenObjInfo{ - Namespace: "default", + Namespace: obj.GetNamespace(), PodLabelSelectors: selector.(map[string]any)["matchLabels"].(map[string]any), DataType: dataType, Workload: obj.GetKind(), @@ -56,13 +62,13 @@ func CreateTelemetryGenObjects(t *testing.T, client *dynamic.DynamicClient, test return createdObjs, telemetrygenObjInfos } -func WaitForTelemetryGenToStart(t *testing.T, client *dynamic.DynamicClient, podNamespace string, podLabels map[string]any, workload, dataType string) { +func WaitForTelemetryGenToStart(t *testing.T, client *K8sClient, podNamespace string, podLabels map[string]any, workload, dataType string) { podGVR := schema.GroupVersionResource{Version: "v1", Resource: "pods"} listOptions := metav1.ListOptions{LabelSelector: SelectorFromMap(podLabels).String()} podTimeoutMinutes := 3 var podPhase string require.Eventually(t, func() bool { - list, err := client.Resource(podGVR).Namespace(podNamespace).List(context.Background(), listOptions) + list, err := client.DynamicClient.Resource(podGVR).Namespace(podNamespace).List(context.Background(), listOptions) require.NoError(t, err, "failed to list collector pods") if len(list.Items) == 0 { return false diff --git a/internal/kafka/authentication.go b/internal/kafka/authentication.go index 835244fc10dc..a05edc6486c5 100644 --- a/internal/kafka/authentication.go +++ b/internal/kafka/authentication.go @@ -16,10 +16,10 @@ import ( // Authentication defines authentication. type Authentication struct { - PlainText *PlainTextConfig `mapstructure:"plain_text"` - SASL *SASLConfig `mapstructure:"sasl"` - TLS *configtls.TLSClientSetting `mapstructure:"tls"` - Kerberos *KerberosConfig `mapstructure:"kerberos"` + PlainText *PlainTextConfig `mapstructure:"plain_text"` + SASL *SASLConfig `mapstructure:"sasl"` + TLS *configtls.ClientConfig `mapstructure:"tls"` + Kerberos *KerberosConfig `mapstructure:"kerberos"` } // PlainTextConfig defines plaintext authentication. @@ -134,7 +134,7 @@ func configureSASL(config SASLConfig, saramaConfig *sarama.Config) error { return nil } -func configureTLS(config configtls.TLSClientSetting, saramaConfig *sarama.Config) error { +func configureTLS(config configtls.ClientConfig, saramaConfig *sarama.Config) error { tlsConfig, err := config.LoadTLSConfig() if err != nil { return fmt.Errorf("error loading tls config: %w", err) diff --git a/internal/kafka/authentication_test.go b/internal/kafka/authentication_test.go index 071a7ec8bf18..3fa52c62ea33 100644 --- a/internal/kafka/authentication_test.go +++ b/internal/kafka/authentication_test.go @@ -46,7 +46,7 @@ func TestAuthentication(t *testing.T) { saramaTLSCfg := &sarama.Config{} saramaTLSCfg.Net.TLS.Enable = true - tlsClient := configtls.TLSClientSetting{} + tlsClient := configtls.ClientConfig{} tlscfg, err := tlsClient.LoadTLSConfig() require.NoError(t, err) saramaTLSCfg.Net.TLS.Config = tlscfg @@ -73,12 +73,12 @@ func TestAuthentication(t *testing.T) { saramaConfig: saramaPlaintext, }, { - auth: Authentication{TLS: &configtls.TLSClientSetting{}}, + auth: Authentication{TLS: &configtls.ClientConfig{}}, saramaConfig: saramaTLSCfg, }, { - auth: Authentication{TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{CAFile: "/doesnotexists"}, + auth: Authentication{TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{CAFile: "/doesnotexists"}, }}, saramaConfig: saramaTLSCfg, err: "failed to load TLS config", diff --git a/internal/kafka/go.mod b/internal/kafka/go.mod index 583e3f705e4e..0795ed4dd4c5 100644 --- a/internal/kafka/go.mod +++ b/internal/kafka/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.50.27 github.com/stretchr/testify v1.9.0 github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -34,7 +34,7 @@ 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 v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect diff --git a/internal/kafka/go.sum b/internal/kafka/go.sum index 635f32ac2cce..5d221e5ab673 100644 --- a/internal/kafka/go.sum +++ b/internal/kafka/go.sum @@ -87,10 +87,10 @@ 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 v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/internal/kubelet/client_config.go b/internal/kubelet/client_config.go index ff8c86f2c8cb..91eb85267d68 100644 --- a/internal/kubelet/client_config.go +++ b/internal/kubelet/client_config.go @@ -11,8 +11,8 @@ import ( // ClientConfig for a kubelet client for talking to a kubelet HTTP endpoint. type ClientConfig struct { - k8sconfig.APIConfig `mapstructure:",squash"` - configtls.TLSSetting `mapstructure:",squash"` + k8sconfig.APIConfig `mapstructure:",squash"` + configtls.Config `mapstructure:",squash"` // InsecureSkipVerify controls whether the client verifies the server's // certificate chain and host name. InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` diff --git a/internal/kubelet/client_test.go b/internal/kubelet/client_test.go index cdc0c10ed457..c0a3b86fec7c 100644 --- a/internal/kubelet/client_test.go +++ b/internal/kubelet/client_test.go @@ -55,7 +55,7 @@ func TestNewTLSClientProvider(t *testing.T) { APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeTLS, }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: certPath, CertFile: certPath, KeyFile: keyFile, @@ -278,7 +278,7 @@ func TestTLSMissingCertFile(t *testing.T) { p := tlsClientProvider{ endpoint: "", cfg: &ClientConfig{ - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: certPath, }, }, diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 2fbeb0abd6f6..aa67e56866f1 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/client-go v0.29.2 + k8s.io/client-go v0.29.3 ) require ( @@ -21,7 +21,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect @@ -36,7 +36,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 v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect @@ -45,12 +45,12 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 72cab9a9273b..7eb88d5432c2 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -105,9 +105,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -118,7 +117,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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.2/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.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= @@ -246,10 +244,10 @@ 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 v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= go.opentelemetry.io/collector/confmap v0.96.0 h1:415ELCfC8S3xjiNFLneDWJi6h7j7SUw8A8pZtINEQdI= go.opentelemetry.io/collector/confmap v0.96.0/go.mod h1:q/dWHLvkk1vgvAF0l5dbgQSiPOmGwpv0FwcNaGpqsfM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -476,10 +474,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.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-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -508,14 +504,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/metadataproviders/go.mod b/internal/metadataproviders/go.mod index 06495079967e..1c65dd7bcc85 100644 --- a/internal/metadataproviders/go.mod +++ b/internal/metadataproviders/go.mod @@ -9,13 +9,13 @@ require ( github.com/hashicorp/consul/api v1.28.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.uber.org/goleak v1.3.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -34,7 +34,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.4.0 // indirect @@ -78,7 +78,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/metadataproviders/go.sum b/internal/metadataproviders/go.sum index deb29817ddfb..f18bca1d9580 100644 --- a/internal/metadataproviders/go.sum +++ b/internal/metadataproviders/go.sum @@ -154,9 +154,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -406,8 +405,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.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -665,10 +664,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -702,14 +699,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 9449e6ae5e52..2727ce99b1ba 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -27,9 +27,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect @@ -42,7 +42,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 2a02bcecfaef..e5fda03c6ca2 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -51,14 +51,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -110,8 +110,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 58e41b0949c9..70592651d7b2 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -41,7 +41,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index ddf3d8330ff4..5f0f65c06e7b 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -22,6 +22,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -63,28 +65,28 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/receiver v0.96.0 h1:OrlcuyFCBQpbWNb2klzTdz1ZXMk0acRDh7fbaQtP4eo= go.opentelemetry.io/collector/receiver v0.96.0/go.mod h1:fb5Vr2+tAkzB4qE6+lNaMsZwaeE8qZvG3IBdzK5hCRY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -136,8 +138,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/sqlquery/config.go b/internal/sqlquery/config.go index d45fbf4a9960..c679d81db4d7 100644 --- a/internal/sqlquery/config.go +++ b/internal/sqlquery/config.go @@ -9,16 +9,15 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" - "go.uber.org/multierr" ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Driver string `mapstructure:"driver"` - DataSource string `mapstructure:"datasource"` - Queries []Query `mapstructure:"queries"` - StorageID *component.ID `mapstructure:"storage"` - Telemetry TelemetryConfig `mapstructure:"telemetry"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Driver string `mapstructure:"driver"` + DataSource string `mapstructure:"datasource"` + Queries []Query `mapstructure:"queries"` + StorageID *component.ID `mapstructure:"storage"` + Telemetry TelemetryConfig `mapstructure:"telemetry"` } func (c Config) Validate() error { @@ -48,24 +47,24 @@ type Query struct { } func (q Query) Validate() error { - var errs error + var errs []error if q.SQL == "" { - errs = multierr.Append(errs, errors.New("'query.sql' cannot be empty")) + errs = append(errs, errors.New("'query.sql' cannot be empty")) } if len(q.Logs) == 0 && len(q.Metrics) == 0 { - errs = multierr.Append(errs, errors.New("at least one of 'query.logs' and 'query.metrics' must not be empty")) + errs = append(errs, errors.New("at least one of 'query.logs' and 'query.metrics' must not be empty")) } for _, logs := range q.Logs { if err := logs.Validate(); err != nil { - errs = multierr.Append(errs, err) + errs = append(errs, err) } } for _, metric := range q.Metrics { if err := metric.Validate(); err != nil { - errs = multierr.Append(errs, err) + errs = append(errs, err) } } - return errs + return errors.Join(errs...) } type LogsCfg struct { @@ -73,11 +72,11 @@ type LogsCfg struct { } func (config LogsCfg) Validate() error { - var errs error + var errs []error if config.BodyColumn == "" { - errs = multierr.Append(errs, errors.New("'body_column' must not be empty")) + errs = append(errs, errors.New("'body_column' must not be empty")) } - return errs + return errors.Join(errs...) } type MetricCfg struct { @@ -96,29 +95,29 @@ type MetricCfg struct { } func (c MetricCfg) Validate() error { - var errs error + var errs []error if c.MetricName == "" { - errs = multierr.Append(errs, errors.New("'metric_name' cannot be empty")) + errs = append(errs, errors.New("'metric_name' cannot be empty")) } if c.ValueColumn == "" { - errs = multierr.Append(errs, errors.New("'value_column' cannot be empty")) + errs = append(errs, errors.New("'value_column' cannot be empty")) } if err := c.ValueType.Validate(); err != nil { - errs = multierr.Append(errs, err) + errs = append(errs, err) } if err := c.DataType.Validate(); err != nil { - errs = multierr.Append(errs, err) + errs = append(errs, err) } if err := c.Aggregation.Validate(); err != nil { - errs = multierr.Append(errs, err) + errs = append(errs, err) } if c.DataType == MetricTypeGauge && c.Aggregation != "" { - errs = multierr.Append(errs, fmt.Errorf("aggregation=%s but data_type=%s does not support aggregation", c.Aggregation, c.DataType)) + errs = append(errs, fmt.Errorf("aggregation=%s but data_type=%s does not support aggregation", c.Aggregation, c.DataType)) } if errs != nil && c.MetricName != "" { - errs = multierr.Append(fmt.Errorf("invalid metric config with metric_name '%s'", c.MetricName), errs) + errs = append(errs, fmt.Errorf("invalid metric config with metric_name '%s'", c.MetricName)) } - return errs + return errors.Join(errs...) } type MetricType string diff --git a/internal/sqlquery/db_client.go b/internal/sqlquery/db_client.go index 9f7d00908f0f..e702a6b82923 100644 --- a/internal/sqlquery/db_client.go +++ b/internal/sqlquery/db_client.go @@ -5,6 +5,7 @@ package sqlquery // import "github.com/open-telemetry/opentelemetry-collector-co import ( "context" + "errors" // register Db drivers _ "github.com/SAP/go-hdb/driver" @@ -14,7 +15,6 @@ import ( _ "github.com/microsoft/go-mssqldb/integratedauth/krb5" _ "github.com/sijms/go-ora/v2" _ "github.com/snowflakedb/gosnowflake" - "go.uber.org/multierr" "go.uber.org/zap" ) @@ -52,7 +52,7 @@ func (cl DbSQLClient) QueryRows(ctx context.Context, args ...any) ([]StringMap, return nil, err } scanner := newRowScanner(colTypes) - var warnings error + var warnings []error for sqlRows.Next() { err = scanner.scan(sqlRows) if err != nil { @@ -60,11 +60,11 @@ func (cl DbSQLClient) QueryRows(ctx context.Context, args ...any) ([]StringMap, } sm, scanErr := scanner.toStringMap() if scanErr != nil { - warnings = multierr.Append(warnings, scanErr) + warnings = append(warnings, scanErr) } out = append(out, sm) } - return out, warnings + return out, errors.Join(warnings...) } func (cl DbSQLClient) prepareQueryFields(sql string, args []any) []zap.Field { diff --git a/internal/sqlquery/db_client_test.go b/internal/sqlquery/db_client_test.go index a40ebd02e31f..4546886b0ec0 100644 --- a/internal/sqlquery/db_client_test.go +++ b/internal/sqlquery/db_client_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.uber.org/multierr" "go.uber.org/zap" ) @@ -90,11 +89,16 @@ func TestDBSQLClient_Nulls_MultiRow(t *testing.T) { } rows, err := cl.QueryRows(context.Background()) assert.Error(t, err) - errs := multierr.Errors(err) - for _, err := range errs { - assert.True(t, errors.Is(err, errNullValueWarning)) + + var e interface{ Unwrap() []error } + if errors.As(err, &e) { + uw := e.Unwrap() + assert.Len(t, uw, 2) + + for _, err := range uw { + assert.True(t, errors.Is(err, errNullValueWarning)) + } } - assert.Len(t, errs, 2) assert.Len(t, rows, 2) assert.EqualValues(t, map[string]string{ "col_0": "42", diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index cce24b9e112d..e5749ed094fe 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -3,21 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlque go 1.21 require ( - github.com/SAP/go-hdb v1.8.5 - github.com/go-sql-driver/mysql v1.7.1 + github.com/SAP/go-hdb v1.8.11 + github.com/go-sql-driver/mysql v1.8.0 github.com/lib/pq v1.10.9 github.com/microsoft/go-mssqldb v1.7.0 - github.com/sijms/go-ora/v2 v2.8.8 + github.com/sijms/go-ora/v2 v2.8.10 github.com/snowflakedb/gosnowflake v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) require ( + filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect @@ -80,32 +81,32 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/sqlquery/go.sum b/internal/sqlquery/go.sum index c7566f72e5a7..45ebc2827144 100644 --- a/internal/sqlquery/go.sum +++ b/internal/sqlquery/go.sum @@ -1,3 +1,5 @@ +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= @@ -18,8 +20,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/aws/aws-sdk-go-v2 v1.17.7 h1:CLSjnhJSTSogvqUGhIC6LqFKATMRexcxLZ0i/Nzk9Eg= @@ -82,8 +84,8 @@ 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-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -184,14 +186,14 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/snowflakedb/gosnowflake v1.8.0 h1:4bQj8eAYGMkou/nICiIEb9jSbBLDDp5cB6JaKx9WwiA= @@ -216,20 +218,20 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -253,8 +255,8 @@ 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/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -271,8 +273,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -290,13 +292,13 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= 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.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -320,8 +322,8 @@ gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/internal/sqlquery/metrics.go b/internal/sqlquery/metrics.go index 4a00e3b6269d..01cb8dbae856 100644 --- a/internal/sqlquery/metrics.go +++ b/internal/sqlquery/metrics.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/receiver/scraperhelper" ) -func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ScraperControllerSettings) error { +func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ControllerConfig) error { dest.SetName(cfg.MetricName) dest.SetDescription(cfg.Description) dest.SetUnit(cfg.Unit) @@ -63,7 +63,7 @@ func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pc return nil } -func setTimestamp(cfg MetricCfg, dp pmetric.NumberDataPoint, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ScraperControllerSettings) { +func setTimestamp(cfg MetricCfg, dp pmetric.NumberDataPoint, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ControllerConfig) { dp.SetTimestamp(ts) // Cumulative sum should have a start time set to the beginning of the data points cumulation diff --git a/internal/sqlquery/scraper.go b/internal/sqlquery/scraper.go index e43edf4aea34..9db99d6ea198 100644 --- a/internal/sqlquery/scraper.go +++ b/internal/sqlquery/scraper.go @@ -15,7 +15,6 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/scrapererror" "go.opentelemetry.io/collector/receiver/scraperhelper" - "go.uber.org/multierr" "go.uber.org/zap" ) @@ -28,7 +27,7 @@ type ClientProviderFunc func(Db, string, *zap.Logger, TelemetryConfig) DbClient type Scraper struct { id component.ID Query Query - ScrapeCfg scraperhelper.ScraperControllerSettings + ScrapeCfg scraperhelper.ControllerConfig StartTime pcommon.Timestamp ClientProviderFunc ClientProviderFunc DbProviderFunc DbProviderFunc @@ -40,7 +39,7 @@ type Scraper struct { var _ scraperhelper.Scraper = (*Scraper)(nil) -func NewScraper(id component.ID, query Query, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, telemetry TelemetryConfig, dbProviderFunc DbProviderFunc, clientProviderFunc ClientProviderFunc) *Scraper { +func NewScraper(id component.ID, query Query, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, telemetry TelemetryConfig, dbProviderFunc DbProviderFunc, clientProviderFunc ClientProviderFunc) *Scraper { return &Scraper{ id: id, Query: query, @@ -84,17 +83,17 @@ func (s *Scraper) Scrape(ctx context.Context) (pmetric.Metrics, error) { sms := rm.ScopeMetrics() sm := sms.AppendEmpty() ms := sm.Metrics() - var errs error + var errs []error for _, metricCfg := range s.Query.Metrics { for i, row := range rows { if err = rowToMetric(row, metricCfg, ms.AppendEmpty(), s.StartTime, ts, s.ScrapeCfg); err != nil { err = fmt.Errorf("row %d: %w", i, err) - errs = multierr.Append(errs, err) + errs = append(errs, err) } } } if errs != nil { - return out, scrapererror.NewPartialScrapeError(errs, len(multierr.Errors(errs))) + return out, scrapererror.NewPartialScrapeError(errors.Join(errs...), len(errs)) } return out, nil } diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 2f40e17ba486..ab5e5db35bc8 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -3,22 +3,22 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/tools go 1.21 require ( - github.com/Khan/genqlient v0.6.0 + github.com/Khan/genqlient v0.7.0 github.com/client9/misspell v0.3.4 - github.com/daixiang0/gci v0.12.1 + github.com/daixiang0/gci v0.13.1 github.com/golangci/golangci-lint v1.55.2 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 github.com/jstemmer/go-junit-report v1.0.0 - go.opentelemetry.io/build-tools/checkfile v0.12.0 + go.opentelemetry.io/build-tools/checkfile v0.13.0 go.opentelemetry.io/build-tools/chloggen v0.13.0 - go.opentelemetry.io/build-tools/crosslink v0.12.0 + go.opentelemetry.io/build-tools/crosslink v0.13.0 go.opentelemetry.io/build-tools/issuegenerator v0.13.0 go.opentelemetry.io/build-tools/multimod v0.13.0 - go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 - golang.org/x/tools v0.18.0 + golang.org/x/tools v0.19.0 golang.org/x/vuln v1.0.4 gotest.tools/gotestsum v1.11.0 ) @@ -187,7 +187,7 @@ require ( github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect github.com/securego/gosec/v2 v2.18.2 // indirect - github.com/sergi/go-diff v1.1.0 // indirect + github.com/sergi/go-diff v1.3.1 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect @@ -217,7 +217,7 @@ require ( github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.0.5 // indirect github.com/uudashr/gocognit v1.1.2 // indirect - github.com/vektah/gqlparser/v2 v2.5.1 // indirect + github.com/vektah/gqlparser/v2 v2.5.11 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/yagipy/maintidx v1.0.0 // indirect @@ -226,30 +226,30 @@ require ( gitlab.com/bosi/decorder v0.4.1 // indirect go-simpler.org/sloglint v0.1.2 // indirect go.opentelemetry.io/build-tools v0.13.0 // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/mod v0.16.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 65098d1a3ddd..bc9ed6991020 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -55,8 +55,8 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rW github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0pzhpe2TdhRniBF++PRHQuRpR8esVc= -github.com/Khan/genqlient v0.6.0 h1:Bwb1170ekuNIVIwTJEqvO8y7RxBxXu639VJOkKSrwAk= -github.com/Khan/genqlient v0.6.0/go.mod h1:rvChwWVTqXhiapdhLDV4bp9tz/Xvtewwkon4DpWWCRM= +github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= +github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -66,7 +66,6 @@ github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/ github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ= github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= @@ -154,8 +153,8 @@ github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDU github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/daixiang0/gci v0.12.1 h1:ugsG+KRYny1VK4oqrX4Vtj70bo4akYKa0tgT1DXMYiY= -github.com/daixiang0/gci v0.12.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/daixiang0/gci v0.13.1 h1:jkQWCPu7JZhNoO+OMHFxs1KGonWPhXw9txySE8qwAb0= +github.com/daixiang0/gci v0.13.1/go.mod h1:JyUVY/ZKzBjrzLOm2UQDZohEZ2HlfX72jONBV0REVb4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -506,8 +505,8 @@ github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xl github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA= github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY= -github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= +github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= +github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= @@ -579,8 +578,8 @@ github.com/sashamelentyev/usestdlibvars v1.24.0 h1:MKNzmXtGh5N0y74Z/CIaJh4GlB364 github.com/sashamelentyev/usestdlibvars v1.24.0/go.mod h1:9cYkq+gYJ+a5W2RPdhfaSCnTVUC1OQP/bSiiBhq3OZE= github.com/securego/gosec/v2 v2.18.2 h1:DkDt3wCiOtAHf1XkiXZBhQ6m6mK/b9T/wD257R3/c+I= github.com/securego/gosec/v2 v2.18.2/go.mod h1:xUuqSF6i0So56Y2wwohWAmB07EdBkUN6crbLlHwbyJs= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= @@ -663,8 +662,8 @@ github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqz github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= -github.com/vektah/gqlparser/v2 v2.5.1 h1:ZGu+bquAY23jsxDRcYpWjttRZrUz07LbiY77gUOHcr4= -github.com/vektah/gqlparser/v2 v2.5.1/go.mod h1:mPgqFBu/woKTVYWyNk8cO3kh4S/f4aRFZrvOnp3hmCs= +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/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= @@ -695,30 +694,30 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/build-tools v0.13.0 h1:0I3jJQ2zcJU8k4ZjyHNqUBX2Len1UvBIOzVP4b50g9A= go.opentelemetry.io/build-tools v0.13.0/go.mod h1:PEtg5iWjNI9WAlKXP/xll/hgbq/Cp4Ma4T1ssKB2T0Q= -go.opentelemetry.io/build-tools/checkfile v0.12.0 h1:1g3iBxjPuack0pEvqkTiEcyh0uJvKXkQg8IMJkhiFX0= -go.opentelemetry.io/build-tools/checkfile v0.12.0/go.mod h1:0Ql58QUUwr2jaQJSjFKkAFkT/Eent7eEOKiQ1+R+zvA= +go.opentelemetry.io/build-tools/checkfile v0.13.0 h1:Nq13fOLpF9T+y4birZbfv6JurFC1Pla5UwC+t0GMbAo= +go.opentelemetry.io/build-tools/checkfile v0.13.0/go.mod h1:fRNphqnBebBiwL1A3OofgCDiJ6enb73uKGIO+n0gHPI= go.opentelemetry.io/build-tools/chloggen v0.13.0 h1:C30r8ecNuJ30T3+vSvFJhaXUjUpx6r07nM3weDCpS7U= go.opentelemetry.io/build-tools/chloggen v0.13.0/go.mod h1:1Ueg04+D2eU7Lm80RqS4DYTdtkHwTmulQZL0tUI4iAk= -go.opentelemetry.io/build-tools/crosslink v0.12.0 h1:GNJQURuabE5rAkIbnrqndIKyXrr7wFy54e/8ujkgjHg= -go.opentelemetry.io/build-tools/crosslink v0.12.0/go.mod h1:QE8Kxf4Ygg2ltSHE+Vdys/67jtQM26j7spJLyjNA2DU= +go.opentelemetry.io/build-tools/crosslink v0.13.0 h1:R0V89bTYzoJpasiOIYiQo6txL/ZTzMdEuthJ4gLUTF8= +go.opentelemetry.io/build-tools/crosslink v0.13.0/go.mod h1:aYIwOj9b3Nmgm6nIZZk28tF/JjpicI8xenEVUeoVNp0= go.opentelemetry.io/build-tools/issuegenerator v0.13.0 h1:hAzDPWh/oyBVoYRB5Xb8Y6/3Zs0/JD3uwkp1pQWt8vM= go.opentelemetry.io/build-tools/issuegenerator v0.13.0/go.mod h1:hHPQ5lv0apJv0QM8mz/k5nAwacDEEDD+fJ8xYhrKjBM= go.opentelemetry.io/build-tools/multimod v0.13.0 h1:HGAP3zCM8vOTNJSQbjQ5VbKZSctIZxppPBxRTzye7ic= go.opentelemetry.io/build-tools/multimod v0.13.0/go.mod h1:CxZp68c4PIN+bYlVOGB2FvE5zZMBuGz7cGSHv2L7pSc= -go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240305232712-5a68058e0e3a h1:MAuePVguATRp3hM3W3Ib5HIFVIeDynIjK6ekbDUqeBU= -go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:1Odbp7rTiPEXoJEcVMdw2Q1a3pmOTATlip3+kgFL02k= -go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240305232712-5a68058e0e3a h1:sFJRMbLZbZlLNbeA5v9fn3OTvS2N51CBC4G5cUxqpo4= -go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:7DsznaaPs30puddnm9/49+HBq5UQ7tRKM0aPSG8yDTc= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16 h1:BBiMQhOWLgJ1NeNA3uimw1ofeSsIq+BJl5E94Zd7RqE= +go.opentelemetry.io/collector/cmd/builder v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:1Odbp7rTiPEXoJEcVMdw2Q1a3pmOTATlip3+kgFL02k= +go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KAqXgwr0dtrh4FUyWFZH6dUaQxWadDtUuvQiI6013t4= +go.opentelemetry.io/collector/cmd/mdatagen v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:byF/nAju2wTCfj6cq+GDDV4LnewujFWBhWKnOT3aeYg= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -745,8 +744,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -793,8 +792,8 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -837,8 +836,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -921,8 +920,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -932,8 +931,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1018,8 +1017,8 @@ golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/vuln v1.0.4 h1:SP0mPeg2PmGCu03V+61EcQiOjmpri2XijexKdzv8Z1I= golang.org/x/vuln v1.0.4/go.mod h1:NbJdUQhX8jY++FtuhrXs2Eyx0yePo9pF7nPlIjo9aaQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1093,8 +1092,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -1124,7 +1123,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 9f157b081505..f24c684fe9a5 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -22,7 +22,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index ea8b6600a24f..ef39d0843aeb 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -35,10 +35,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -76,8 +76,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index d739c51dc29b..aa7e2564bd3b 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -22,7 +22,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 8d4e17d75d1f..0c2b0ef9df1d 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -34,8 +34,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -73,8 +73,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/experimentalmetricmetadata/go.mod b/pkg/experimentalmetricmetadata/go.mod index fb6f21eb978c..e4ba6d56d7b0 100644 --- a/pkg/experimentalmetricmetadata/go.mod +++ b/pkg/experimentalmetricmetadata/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -22,7 +22,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/experimentalmetricmetadata/go.sum b/pkg/experimentalmetricmetadata/go.sum index 8d4e17d75d1f..0c2b0ef9df1d 100644 --- a/pkg/experimentalmetricmetadata/go.sum +++ b/pkg/experimentalmetricmetadata/go.sum @@ -34,8 +34,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -73,8 +73,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/golden/go.mod b/pkg/golden/go.mod index 183eef025310..d437773f1092 100644 --- a/pkg/golden/go.mod +++ b/pkg/golden/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -24,7 +24,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/pkg/golden/go.sum b/pkg/golden/go.sum index a24a7ce3e699..4abd423cfe53 100644 --- a/pkg/golden/go.sum +++ b/pkg/golden/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -74,8 +74,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/ottl/e2e/e2e_test.go b/pkg/ottl/e2e/e2e_test.go index 26dbaf85be18..315a00e8c28b 100644 --- a/pkg/ottl/e2e/e2e_test.go +++ b/pkg/ottl/e2e/e2e_test.go @@ -249,6 +249,12 @@ func Test_e2e_converters(t *testing.T) { statement string want func(tCtx ottllog.TransformContext) }{ + { + statement: `set(attributes["test"], Base64Decode("cGFzcw=="))`, + want: func(tCtx ottllog.TransformContext) { + tCtx.GetLogRecord().Attributes().PutStr("test", "pass") + }, + }, { statement: `set(attributes["test"], Concat(["A","B"], ":"))`, want: func(tCtx ottllog.TransformContext) { @@ -479,6 +485,22 @@ func Test_e2e_converters(t *testing.T) { m.PutStr("k2", "v2__!__v2") }, }, + { + statement: `set(attributes["test"], ParseXML("This is a log message!"))`, + want: func(tCtx ottllog.TransformContext) { + log := tCtx.GetLogRecord().Attributes().PutEmptyMap("test") + log.PutStr("tag", "Log") + + attrs := log.PutEmptyMap("attributes") + attrs.PutStr("id", "1") + + logChildren := log.PutEmptySlice("children") + + message := logChildren.AppendEmpty().SetEmptyMap() + message.PutStr("tag", "Message") + message.PutStr("content", "This is a log message!") + }, + }, { statement: `set(attributes["test"], Seconds(Duration("1m")))`, want: func(tCtx ottllog.TransformContext) { diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 5f67f1e7d594..37c25e5216bd 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect @@ -53,7 +53,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 406ef98b1bb6..18c7b45552ef 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -76,14 +76,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -137,8 +137,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/ottl/ottlfuncs/README.md b/pkg/ottl/ottlfuncs/README.md index 9f4728c8b5c1..94712ca3074d 100644 --- a/pkg/ottl/ottlfuncs/README.md +++ b/pkg/ottl/ottlfuncs/README.md @@ -377,6 +377,7 @@ Unlike functions, they do not modify any input telemetry and always return a val Available Converters: +- [Base64Decode](#base64decode) - [Concat](#concat) - [ConvertCase](#convertcase) - [ExtractPatterns](#extractpatterns) @@ -402,6 +403,7 @@ Available Converters: - [ParseCSV](#parsecsv) - [ParseJSON](#parsejson) - [ParseKeyValue](#parsekeyvalue) +- [ParseXML](#parsexml) - [Seconds](#seconds) - [SHA1](#sha1) - [SHA256](#sha256) @@ -417,6 +419,21 @@ Available Converters: - [UnixSeconds](#unixseconds) - [UUID](#UUID) +### Base64Decode + +`Base64Decode(value)` + +The `Base64Decode` Converter takes a base64 encoded string and returns the decoded string. + +`value` is a valid base64 encoded string. + +Examples: + +- `Base64Decode("aGVsbG8gd29ybGQ=")` + + +- `Base64Decode(attributes["encoded field"])` + ### Concat `Concat(values[], delimiter)` @@ -897,6 +914,78 @@ Examples: - `ParseKeyValue(attributes["pairs"])` +### ParseXML + +`ParseXML(target)` + +The `ParseXML` Converter returns a `pcommon.Map` struct that is the result of parsing the target string as an XML document. + +`target` is a Getter that returns a string. This string should be in XML format. +If `target` is not a string, nil, or cannot be parsed as XML, `ParseXML` will return an error. + +Unmarshalling XML is done using the following rules: +1. All character data for an XML element is trimmed, joined, and placed into the `content` field. +2. The tag for an XML element is trimmed, and placed into the `tag` field. +3. The attributes for an XML element is placed as a `pcommon.Map` into the `attribute` field. +4. Processing instructions, directives, and comments are ignored and not represented in the resultant map. +5. All child elements are parsed as above, and placed in a `pcommon.Slice`, which is then placed into the `children` field. + +For example, the following XML document: +```xml + + + + 00001 + Joe + joe.smith@example.com + + User fired alert A + +``` + +will be parsed as: +```json +{ + "tag": "Log", + "children": [ + { + "tag": "User", + "children": [ + { + "tag": "ID", + "content": "00001" + }, + { + "tag": "Name", + "content": "Joe", + "attributes": { + "type": "first" + } + }, + { + "tag": "Email", + "content": "joe.smith@example.com" + } + ] + }, + { + "tag": "Text", + "content": "User fired alert A" + } + ] +} +``` + +Examples: + +- `ParseXML(body)` + +- `ParseXML(attributes["xml"])` + +- `ParseXML("")` + + + ### Seconds `Seconds(value)` diff --git a/pkg/ottl/ottlfuncs/func_base64decode.go b/pkg/ottl/ottlfuncs/func_base64decode.go new file mode 100644 index 000000000000..42e401d71505 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_base64decode.go @@ -0,0 +1,45 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottlfuncs" + +import ( + "context" + "encoding/base64" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type Base64DecodeArguments[K any] struct { + Target ottl.StringGetter[K] +} + +func NewBase64DecodeFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Base64Decode", &Base64DecodeArguments[K]{}, createBase64DecodeFunction[K]) +} + +func createBase64DecodeFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*Base64DecodeArguments[K]) + + if !ok { + return nil, fmt.Errorf("Base64DecodeFactory args must be of type *Base64DecodeArguments[K]") + } + + return Base64Decode(args.Target) +} + +func Base64Decode[K any](target ottl.StringGetter[K]) (ottl.ExprFunc[K], error) { + + return func(ctx context.Context, tCtx K) (any, error) { + val, err := target.Get(ctx, tCtx) + if err != nil { + return nil, err + } + base64string, err := base64.StdEncoding.DecodeString(val) + if err != nil { + return nil, err + } + return string(base64string), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_base64decode_test.go b/pkg/ottl/ottlfuncs/func_base64decode_test.go new file mode 100644 index 000000000000..e6abf925fd98 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_base64decode_test.go @@ -0,0 +1,92 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Base64Decode(t *testing.T) { + tests := []struct { + name string + value any + expected any + err bool + }{ + { + name: "base64-string", + value: "aGVsbG8gd29ybGQ=", + expected: "hello world", + }, + { + name: "empty string", + value: "", + expected: "", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Base64Decode[any](&ottl.StandardStringGetter[any]{ + Getter: func(context.Context, any) (any, error) { + return tt.value, nil + }, + }) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + if tt.err { + assert.Error(t, err) + } else { + assert.NoError(t, err) + } + assert.Equal(t, tt.expected, result) + }) + } +} + +func Test_Base64DecodeError(t *testing.T) { + tests := []struct { + name string + value any + err bool + expectedError string + }{ + { + name: "non-string", + value: 10, + expectedError: "expected string but got int", + }, + { + name: "nil", + value: nil, + expectedError: "expected string but got nil", + }, + { + name: "not-base64-string", + value: "!@#$%^&*()_+", + expectedError: "illegal base64 data at input byte", + }, + { + name: "missing-base64-padding", + value: "cmVtb3ZlZCBwYWRkaW5nCg", + expectedError: "illegal base64 data at input byte", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Base64Decode[any](&ottl.StandardStringGetter[any]{ + Getter: func(context.Context, any) (any, error) { + return tt.value, nil + }, + }) + assert.NoError(t, err) + _, err = exprFunc(nil, nil) + assert.ErrorContains(t, err, tt.expectedError) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_parse_xml.go b/pkg/ottl/ottlfuncs/func_parse_xml.go new file mode 100644 index 000000000000..42dac93307df --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_parse_xml.go @@ -0,0 +1,134 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottlfuncs" + +import ( + "bytes" + "context" + "encoding/xml" + "errors" + "fmt" + "strings" + + "go.opentelemetry.io/collector/pdata/pcommon" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type ParseXMLArguments[K any] struct { + Target ottl.StringGetter[K] +} + +func NewParseXMLFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("ParseXML", &ParseXMLArguments[K]{}, createParseXMLFunction[K]) +} + +func createParseXMLFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*ParseXMLArguments[K]) + + if !ok { + return nil, fmt.Errorf("ParseXMLFactory args must be of type *ParseXMLArguments[K]") + } + + return parseXML(args.Target), nil +} + +// parseXML returns a `pcommon.Map` struct that is a result of parsing the target string as XML +func parseXML[K any](target ottl.StringGetter[K]) ottl.ExprFunc[K] { + return func(ctx context.Context, tCtx K) (any, error) { + targetVal, err := target.Get(ctx, tCtx) + if err != nil { + return nil, err + } + + parsedXML := xmlElement{} + + decoder := xml.NewDecoder(strings.NewReader(targetVal)) + err = decoder.Decode(&parsedXML) + if err != nil { + return nil, fmt.Errorf("unmarshal xml: %w", err) + } + + if decoder.InputOffset() != int64(len(targetVal)) { + return nil, errors.New("trailing bytes after parsing xml") + } + + parsedMap := pcommon.NewMap() + parsedXML.intoMap(parsedMap) + + return parsedMap, nil + } +} + +type xmlElement struct { + tag string + attributes []xml.Attr + text string + children []xmlElement +} + +// UnmarshalXML implements xml.Unmarshaler for xmlElement +func (a *xmlElement) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + a.tag = start.Name.Local + a.attributes = start.Attr + + for { + tok, err := d.Token() + if err != nil { + return fmt.Errorf("decode next token: %w", err) + } + + switch t := tok.(type) { + case xml.StartElement: + child := xmlElement{} + err := d.DecodeElement(&child, &t) + if err != nil { + return err + } + + a.children = append(a.children, child) + case xml.EndElement: + // End element means we've reached the end of parsing + return nil + case xml.CharData: + // Strip leading/trailing spaces to ignore newlines and + // indentation in formatted XML + a.text += string(bytes.TrimSpace([]byte(t))) + case xml.Comment: // ignore comments + case xml.ProcInst: // ignore processing instructions + case xml.Directive: // ignore directives + default: + return fmt.Errorf("unexpected token type %T", t) + } + } +} + +// intoMap converts and adds the xmlElement into the provided pcommon.Map. +func (a xmlElement) intoMap(m pcommon.Map) { + m.EnsureCapacity(4) + + m.PutStr("tag", a.tag) + + if a.text != "" { + m.PutStr("content", a.text) + } + + if len(a.attributes) > 0 { + attrs := m.PutEmptyMap("attributes") + attrs.EnsureCapacity(len(a.attributes)) + + for _, attr := range a.attributes { + attrs.PutStr(attr.Name.Local, attr.Value) + } + } + + if len(a.children) > 0 { + children := m.PutEmptySlice("children") + children.EnsureCapacity(len(a.children)) + + for _, child := range a.children { + child.intoMap(children.AppendEmpty().SetEmptyMap()) + } + } +} diff --git a/pkg/ottl/ottlfuncs/func_parse_xml_test.go b/pkg/ottl/ottlfuncs/func_parse_xml_test.go new file mode 100644 index 000000000000..8c348d3a6e76 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_parse_xml_test.go @@ -0,0 +1,309 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "fmt" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/pdata/pcommon" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_ParseXML(t *testing.T) { + tests := []struct { + name string + oArgs ottl.Arguments + want map[string]any + createError string + parseError string + }{ + { + name: "Text values in nested elements", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return "00001Joejoe.smith@example.comUser did a thing", nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "children": []any{ + map[string]any{ + "tag": "User", + "children": []any{ + map[string]any{ + "tag": "ID", + "content": "00001", + }, + map[string]any{ + "tag": "Name", + "content": "Joe", + }, + map[string]any{ + "tag": "Email", + "content": "joe.smith@example.com", + }, + }, + }, + map[string]any{ + "tag": "Text", + "content": "User did a thing", + }, + }, + }, + }, + { + name: "Formatted example", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ` + + + 00001 + Joe + joe.smith@example.com + + User did a thing + `, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "children": []any{ + map[string]any{ + "tag": "User", + "children": []any{ + map[string]any{ + "tag": "ID", + "content": "00001", + }, + map[string]any{ + "tag": "Name", + "content": "Joe", + }, + map[string]any{ + "tag": "Email", + "content": "joe.smith@example.com", + }, + }, + }, + map[string]any{ + "tag": "Text", + "content": "User did a thing", + }, + }, + }, + }, + { + name: "Multiple tags with the same name", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `This record has a collision`, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "This record has a collision", + "children": []any{ + map[string]any{ + "tag": "User", + "attributes": map[string]any{ + "id": "0001", + }, + }, + map[string]any{ + "tag": "User", + "attributes": map[string]any{ + "id": "0002", + }, + }, + }, + }, + }, + { + name: "Multiple lines of content", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ` + This record has multiple lines of + + text content + `, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "This record has multiple lines oftext content", + "children": []any{ + map[string]any{ + "tag": "User", + "attributes": map[string]any{ + "id": "0001", + }, + }, + }, + }, + }, + { + name: "Attribute only element", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ``, nil + }, + }, + }, + want: map[string]any{ + "tag": "HostInfo", + "attributes": map[string]any{ + "hostname": "example.com", + "zone": "east-1", + "cloudprovider": "aws", + }, + }, + }, + { + name: "Ignores XML declaration", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `Log content`, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "Log content", + }, + }, + { + name: "Ignores comments", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `This has a comment `, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "This has a comment", + }, + }, + { + name: "Ignores processing instructions", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `Log content`, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "Log content", + }, + }, + { + name: "Ignores directives", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `Log content`, nil + }, + }, + }, + want: map[string]any{ + "tag": "Log", + "content": "Log content", + }, + }, + { + name: "Missing closing element", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ``, nil + }, + }, + }, + parseError: "unmarshal xml: decode next token: XML syntax error on line 1: unexpected EOF", + }, + { + name: "Missing nested closing element", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ``, nil + }, + }, + }, + parseError: "unmarshal xml: decode next token: XML syntax error on line 1: element closed by ", + }, + { + name: "Multiple XML elements in payload (trailing bytes)", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return ``, nil + }, + }, + }, + parseError: "trailing bytes after parsing xml", + }, + { + name: "Error getting target", + oArgs: &ParseXMLArguments[any]{ + Target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return "", fmt.Errorf("failed to get string") + }, + }, + }, + parseError: "error getting value in ottl.StandardStringGetter[interface {}]: failed to get string", + }, + { + name: "Invalid arguments", + oArgs: nil, + createError: "ParseXMLFactory args must be of type *ParseXMLArguments[K]", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := createParseXMLFunction[any](ottl.FunctionContext{}, tt.oArgs) + if tt.createError != "" { + require.ErrorContains(t, err, tt.createError) + return + } + + require.NoError(t, err) + + result, err := exprFunc(context.Background(), nil) + if tt.parseError != "" { + require.ErrorContains(t, err, tt.parseError) + return + } + + assert.NoError(t, err) + + resultMap, ok := result.(pcommon.Map) + require.True(t, ok) + + require.Equal(t, tt.want, resultMap.AsRaw()) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_truncate_time_test.go b/pkg/ottl/ottlfuncs/func_truncate_time_test.go index 33781d3b478e..626fdd831ea0 100644 --- a/pkg/ottl/ottlfuncs/func_truncate_time_test.go +++ b/pkg/ottl/ottlfuncs/func_truncate_time_test.go @@ -25,7 +25,7 @@ func Test_TruncateTime(t *testing.T) { name: "truncate to 1s", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.Local), nil + return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -34,13 +34,13 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(2022, 1, 1, 1, 1, 1, 0, time.Local), + expected: time.Date(2022, 1, 1, 1, 1, 1, 0, time.UTC), }, { name: "truncate to 1ms", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.Local), nil + return time.Date(2022, 1, 1, 1, 1, 1, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -49,13 +49,13 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(2022, 1, 1, 1, 1, 1, 999000000, time.Local), + expected: time.Date(2022, 1, 1, 1, 1, 1, 999000000, time.UTC), }, { name: "truncate old time", time: &ottl.StandardTimeGetter[any]{ Getter: func(ctx context.Context, tCtx any) (any, error) { - return time.Date(1980, 9, 9, 9, 59, 59, 999999999, time.Local), nil + return time.Date(1980, 9, 9, 9, 59, 59, 999999999, time.UTC), nil }, }, duration: &ottl.StandardDurationGetter[any]{ @@ -64,7 +64,7 @@ func Test_TruncateTime(t *testing.T) { return d, nil }, }, - expected: time.Date(1980, 9, 9, 9, 0, 0, 0, time.Local), + expected: time.Date(1980, 9, 9, 9, 0, 0, 0, time.UTC), }, } for _, tt := range tests { diff --git a/pkg/ottl/ottlfuncs/functions.go b/pkg/ottl/ottlfuncs/functions.go index a12ba9d147ba..9bb33ff3230f 100644 --- a/pkg/ottl/ottlfuncs/functions.go +++ b/pkg/ottl/ottlfuncs/functions.go @@ -35,6 +35,7 @@ func StandardConverters[K any]() map[string]ottl.Factory[K] { func converters[K any]() []ottl.Factory[K] { return []ottl.Factory[K]{ // Converters + NewBase64DecodeFactory[K](), NewConcatFactory[K](), NewConvertCaseFactory[K](), NewDoubleFactory[K](), @@ -60,6 +61,7 @@ func converters[K any]() []ottl.Factory[K] { NewParseCSVFactory[K](), NewParseJSONFactory[K](), NewParseKeyValueFactory[K](), + NewParseXMLFactory[K](), NewSecondsFactory[K](), NewSHA1Factory[K](), NewSHA256Factory[K](), diff --git a/pkg/pdatatest/go.mod b/pkg/pdatatest/go.mod index 7d386f112658..59adcb5a33d7 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -24,7 +24,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/pdatatest/go.sum b/pkg/pdatatest/go.sum index a24a7ce3e699..4abd423cfe53 100644 --- a/pkg/pdatatest/go.sum +++ b/pkg/pdatatest/go.sum @@ -35,8 +35,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -74,8 +74,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/actual.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/actual.yaml index 2183acea9c37..042e8ee25274 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/actual.yaml @@ -20,7 +20,7 @@ resourceSpans: - attributes: - key: testKey2 value: - stringValue: teststringvalue2 + stringValue: unpredictable parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/expected.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/expected.yaml index 042e8ee25274..2183acea9c37 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-attribute-value/expected.yaml @@ -20,7 +20,7 @@ resourceSpans: - attributes: - key: testKey2 value: - stringValue: unpredictable + stringValue: teststringvalue2 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/actual.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/actual.yaml index d6602fc6fc53..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/actual.yaml @@ -16,7 +16,5 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b - endTimeUnixNano: "11651379494838206464" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/expected.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/expected.yaml index 8191dc41f6f8..368785e0f0e1 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-end-timestamp/expected.yaml @@ -16,5 +16,6 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b + endTimeUnixNano: "11651379494838206464" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-spanid/actual.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-spanid/actual.yaml index 817c4fc938d1..3b3954599639 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-spanid/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-spanid/actual.yaml @@ -15,7 +15,5 @@ resourceSpans: stringValue: value1 name: span1 parentSpanId: "" - spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-spanid/expected.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-spanid/expected.yaml index 3b3954599639..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-spanid/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-spanid/expected.yaml @@ -15,5 +15,6 @@ resourceSpans: stringValue: value1 name: span1 parentSpanId: "" + spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/actual.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/actual.yaml index d87405374e69..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/actual.yaml @@ -16,7 +16,5 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b - startTimeUnixNano: "11651379494838206464" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/expected.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/expected.yaml index 8191dc41f6f8..dd50da9b7e79 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-start-timestamp/expected.yaml @@ -16,5 +16,6 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b + startTimeUnixNano: "11651379494838206464" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-traceid/actual.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-traceid/actual.yaml index 817c4fc938d1..f01f0307bac4 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-traceid/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-traceid/actual.yaml @@ -17,5 +17,3 @@ resourceSpans: parentSpanId: "" spanId: fd0da883bb27cd6b status: {} - traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - diff --git a/pkg/pdatatest/ptracetest/testdata/ignore-traceid/expected.yaml b/pkg/pdatatest/ptracetest/testdata/ignore-traceid/expected.yaml index f01f0307bac4..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/ignore-traceid/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/ignore-traceid/expected.yaml @@ -17,3 +17,4 @@ resourceSpans: parentSpanId: "" spanId: fd0da883bb27cd6b status: {} + traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/actual.yaml index e845db6e4f77..28510fc30b9d 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/actual.yaml @@ -20,7 +20,7 @@ resourceSpans: - attributes: - key: key2 value: - stringValue: value2 + stringValue: value3 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/expected.yaml index 28510fc30b9d..e845db6e4f77 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-attributes-mismatch/expected.yaml @@ -20,7 +20,7 @@ resourceSpans: - attributes: - key: key2 value: - stringValue: value3 + stringValue: value2 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/actual.yaml index 8191dc41f6f8..c7cd6a74086f 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/actual.yaml @@ -13,6 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 + droppedAttributesCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/expected.yaml index c7cd6a74086f..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedattributescount-mismatch/expected.yaml @@ -13,7 +13,6 @@ resourceSpans: - key: key1 value: stringValue: value1 - droppedAttributesCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/actual.yaml index 8191dc41f6f8..e8b685b3b5bb 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/actual.yaml @@ -13,6 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 + droppedEventsCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/expected.yaml index e8b685b3b5bb..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedeventscount-mismatch/expected.yaml @@ -13,7 +13,6 @@ resourceSpans: - key: key1 value: stringValue: value1 - droppedEventsCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/actual.yaml index 8191dc41f6f8..1bb2c13ad084 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/actual.yaml @@ -13,6 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 + droppedLinksCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/expected.yaml index 1bb2c13ad084..8191dc41f6f8 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-droppedlinkscount-mismatch/expected.yaml @@ -13,7 +13,6 @@ resourceSpans: - key: key1 value: stringValue: value1 - droppedLinksCount: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/actual.yaml index eaa0db29ef38..4c3b545ee928 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/actual.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - endTimeUnixNano: "11651379494838206464" + endTimeUnixNano: "11651379494838206400" name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/expected.yaml index 4c3b545ee928..eaa0db29ef38 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-endtimestamp-mismatch/expected.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - endTimeUnixNano: "11651379494838206400" + endTimeUnixNano: "11651379494838206464" name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/actual.yaml index 4a7bca4a0df8..e10af274c4da 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/actual.yaml @@ -13,8 +13,6 @@ resourceSpans: - key: key1 value: stringValue: value1 - events: - - name: Sub span event parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/expected.yaml index e10af274c4da..4a7bca4a0df8 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-mismatch/expected.yaml @@ -13,6 +13,8 @@ resourceSpans: - key: key1 value: stringValue: value1 + events: + - name: Sub span event parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/actual.yaml index e1f054accf3b..0c43ec75f6d6 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/actual.yaml @@ -14,7 +14,7 @@ resourceSpans: value: stringValue: value1 events: - - name: event1 + - name: event2 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/expected.yaml index 0c43ec75f6d6..e1f054accf3b 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-events-name-mismatch/expected.yaml @@ -14,7 +14,7 @@ resourceSpans: value: stringValue: value1 events: - - name: event2 + - name: event1 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/actual.yaml index 3bcbfcc7bebf..78ccfee19106 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/actual.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - kind: 2 + kind: 1 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/expected.yaml index 78ccfee19106..3bcbfcc7bebf 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-kind-mismatch/expected.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - kind: 1 + kind: 2 name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/actual.yaml index 99f7cc7c344c..e10af274c4da 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/actual.yaml @@ -13,16 +13,6 @@ resourceSpans: - key: key1 value: stringValue: value1 - links: - - attributes: - - key: testKey1 - value: - stringValue: teststringvalue1 - - key: testKey2 - value: - stringValue: teststringvalue2 - spanId: fd0da883bb27cd6b - traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/expected.yaml index e10af274c4da..99f7cc7c344c 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-mismatch/expected.yaml @@ -13,6 +13,16 @@ resourceSpans: - key: key1 value: stringValue: value1 + links: + - attributes: + - key: testKey1 + value: + stringValue: teststringvalue1 + - key: testKey2 + value: + stringValue: teststringvalue2 + spanId: fd0da883bb27cd6b + traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 parentSpanId: "" spanId: "" status: {} diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/actual.yaml index bc1ff37c83bb..972040290a3f 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/actual.yaml @@ -14,7 +14,7 @@ resourceSpans: value: stringValue: value1 links: - - spanId: "" + - spanId: fd0da883bb27cd6b traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 parentSpanId: "" spanId: "" diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/expected.yaml index 972040290a3f..bc1ff37c83bb 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-links-spanid-mismatch/expected.yaml @@ -14,7 +14,7 @@ resourceSpans: value: stringValue: value1 links: - - spanId: fd0da883bb27cd6b + - spanId: "" traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 parentSpanId: "" spanId: "" diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/actual.yaml index 2a8446e61e6e..725c2484f868 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/actual.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - parentSpanId: bcff497b5a47310f + parentSpanId: 310fbcff497b5a47 spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/expected.yaml index 725c2484f868..2a8446e61e6e 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-parentspanid-mismatch/expected.yaml @@ -13,7 +13,7 @@ resourceSpans: - key: key1 value: stringValue: value1 - parentSpanId: 310fbcff497b5a47 + parentSpanId: bcff497b5a47310f spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/actual.yaml index 32fafc017821..c1dfdf0cf3b3 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/actual.yaml @@ -14,6 +14,6 @@ resourceSpans: value: stringValue: value1 parentSpanId: "" - spanId: fd0da883bb27cd6b + spanId: d0dfa883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/expected.yaml index c1dfdf0cf3b3..32fafc017821 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-spanid-mismatch/expected.yaml @@ -14,6 +14,6 @@ resourceSpans: value: stringValue: value1 parentSpanId: "" - spanId: d0dfa883bb27cd6b + spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/actual.yaml index dd50da9b7e79..c7b15909afa3 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/actual.yaml @@ -16,6 +16,6 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b - startTimeUnixNano: "11651379494838206464" + startTimeUnixNano: "11651379494838206400" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/expected.yaml index c7b15909afa3..dd50da9b7e79 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-starttimestamp-mismatch/expected.yaml @@ -16,6 +16,6 @@ resourceSpans: name: span1 parentSpanId: "" spanId: fd0da883bb27cd6b - startTimeUnixNano: "11651379494838206400" + startTimeUnixNano: "11651379494838206464" status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/actual.yaml index da5360514b26..e10af274c4da 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/actual.yaml @@ -15,6 +15,5 @@ resourceSpans: stringValue: value1 parentSpanId: "" spanId: "" - status: - code: 1 + status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/expected.yaml index e10af274c4da..da5360514b26 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-status-mismatch/expected.yaml @@ -15,5 +15,6 @@ resourceSpans: stringValue: value1 parentSpanId: "" spanId: "" - status: {} + status: + code: 1 traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/actual.yaml index e10af274c4da..0854d8f8469d 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/actual.yaml @@ -16,4 +16,4 @@ resourceSpans: parentSpanId: "" spanId: "" status: {} - traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 + traceId: b8cb1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/expected.yaml index 0854d8f8469d..e10af274c4da 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-traceid-mismatch/expected.yaml @@ -16,4 +16,4 @@ resourceSpans: parentSpanId: "" spanId: "" status: {} - traceId: b8cb1765a7b0acf0b66aa4623fcb7bd5 + traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/actual.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/actual.yaml index 7cd945900f2c..2d63f1fee865 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/actual.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/actual.yaml @@ -17,4 +17,4 @@ resourceSpans: spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - traceState: xx + traceState: yy diff --git a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/expected.yaml b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/expected.yaml index 2d63f1fee865..7cd945900f2c 100644 --- a/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/expected.yaml +++ b/pkg/pdatatest/ptracetest/testdata/scopespans-spans-tracestate-mismatch/expected.yaml @@ -17,4 +17,4 @@ resourceSpans: spanId: fd0da883bb27cd6b status: {} traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 - traceState: yy + traceState: xx diff --git a/pkg/pdatatest/ptracetest/traces.go b/pkg/pdatatest/ptracetest/traces.go index 0e89813880dc..087f9e5a3029 100644 --- a/pkg/pdatatest/ptracetest/traces.go +++ b/pkg/pdatatest/ptracetest/traces.go @@ -206,7 +206,7 @@ func CompareScopeSpans(expected, actual ptrace.ScopeSpans) error { } for as, es := range matchingSpans { - errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span "%s"`, es.Name()), CompareSpan(as, es))) + errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span "%s"`, es.Name()), CompareSpan(es, as))) } return errs @@ -340,7 +340,7 @@ func compareSpanEventSlice(expected, actual ptrace.SpanEventSlice) (errs error) } for ae, ee := range matchingSpanEvents { - errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span event "%s"`, ee.Name()), CompareSpanEvent(ae, ee))) + errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span event "%s"`, ee.Name()), CompareSpanEvent(ee, ae))) } return errs @@ -420,7 +420,7 @@ func compareSpanLinkSlice(expected, actual ptrace.SpanLinkSlice) (errs error) { } for al, el := range matchingSpanLinks { - errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span link "%s"`, el.SpanID()), CompareSpanLink(al, el))) + errs = multierr.Append(errs, internal.AddErrPrefix(fmt.Sprintf(`span link "%s"`, el.SpanID()), CompareSpanLink(el, al))) } return errs diff --git a/pkg/pdatautil/go.mod b/pkg/pdatautil/go.mod index bb853fdfbb4d..63715cc9aaac 100644 --- a/pkg/pdatautil/go.mod +++ b/pkg/pdatautil/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -20,7 +20,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/pdatautil/go.sum b/pkg/pdatautil/go.sum index 5b90d2b41510..9fbffa5d95b6 100644 --- a/pkg/pdatautil/go.sum +++ b/pkg/pdatautil/go.sum @@ -25,8 +25,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -64,8 +64,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 2cf86c560d3a..6a13812b32c9 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -37,7 +37,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 9c3c9648404c..d5a5eb42ea72 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -61,18 +61,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -124,8 +124,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/sampling/go.mod b/pkg/sampling/go.mod index e49517507fa1..ef5103a82408 100644 --- a/pkg/sampling/go.mod +++ b/pkg/sampling/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/multierr v1.11.0 ) @@ -18,7 +18,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/sampling/go.sum b/pkg/sampling/go.sum index 0414c161703e..abc7a57f3050 100644 --- a/pkg/sampling/go.sum +++ b/pkg/sampling/go.sum @@ -23,8 +23,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -62,8 +62,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index e33c7549518d..edd68d73b47a 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -14,21 +14,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 github.com/valyala/fastjson v1.6.4 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/sys v0.18.0 golang.org/x/text v0.14.0 - gonum.org/v1/gonum v0.14.0 + gonum.org/v1/gonum v0.15.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -41,6 +41,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -56,9 +57,9 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect @@ -67,7 +68,7 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect golang.org/x/net v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index f2db09ad45cf..247d7b219afb 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -85,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -172,12 +174,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/stanza/operator/input/syslog/config_test.go b/pkg/stanza/operator/input/syslog/config_test.go index fc8354440db0..3285fb793ca2 100644 --- a/pkg/stanza/operator/input/syslog/config_test.go +++ b/pkg/stanza/operator/input/syslog/config_test.go @@ -39,8 +39,8 @@ func TestUnmarshal(t *testing.T) { cfg.TCP.Encoding = "utf-16" cfg.TCP.SplitConfig.LineStartPattern = "ABC" cfg.TCP.SplitConfig.LineEndPattern = "" - cfg.TCP.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TCP.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "foo", KeyFile: "foo2", CAFile: "foo3", diff --git a/pkg/stanza/operator/input/tcp/config_test.go b/pkg/stanza/operator/input/tcp/config_test.go index 07e7f9305bf6..e760df6018ca 100644 --- a/pkg/stanza/operator/input/tcp/config_test.go +++ b/pkg/stanza/operator/input/tcp/config_test.go @@ -32,8 +32,8 @@ func TestUnmarshal(t *testing.T) { cfg.AddAttributes = true cfg.Encoding = "utf-8" cfg.SplitConfig.LineStartPattern = "ABC" - cfg.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "foo", KeyFile: "foo2", CAFile: "foo3", diff --git a/pkg/stanza/operator/input/tcp/tcp.go b/pkg/stanza/operator/input/tcp/tcp.go index 2dd553e77512..e28853cbd287 100644 --- a/pkg/stanza/operator/input/tcp/tcp.go +++ b/pkg/stanza/operator/input/tcp/tcp.go @@ -68,14 +68,14 @@ type Config struct { // BaseConfig is the detailed configuration of a tcp input operator. type BaseConfig struct { - MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` - ListenAddress string `mapstructure:"listen_address,omitempty"` - TLS *configtls.TLSServerSetting `mapstructure:"tls,omitempty"` - AddAttributes bool `mapstructure:"add_attributes,omitempty"` - OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` - Encoding string `mapstructure:"encoding,omitempty"` - SplitConfig split.Config `mapstructure:"multiline,omitempty"` - TrimConfig trim.Config `mapstructure:",squash"` + MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` + ListenAddress string `mapstructure:"listen_address,omitempty"` + TLS *configtls.ServerConfig `mapstructure:"tls,omitempty"` + AddAttributes bool `mapstructure:"add_attributes,omitempty"` + OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` + Encoding string `mapstructure:"encoding,omitempty"` + SplitConfig split.Config `mapstructure:"multiline,omitempty"` + TrimConfig trim.Config `mapstructure:",squash"` SplitFuncBuilder SplitFuncBuilder } diff --git a/pkg/stanza/operator/input/tcp/tcp_test.go b/pkg/stanza/operator/input/tcp/tcp_test.go index 3bb3c0cbe4be..c08eb4545cfc 100644 --- a/pkg/stanza/operator/input/tcp/tcp_test.go +++ b/pkg/stanza/operator/input/tcp/tcp_test.go @@ -206,8 +206,8 @@ func tlsInputTest(input []byte, expected []string) func(t *testing.T) { cfg := NewConfigWithID("test_id") cfg.ListenAddress = ":0" - cfg.TLS = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLS = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -325,8 +325,8 @@ func TestBuild(t *testing.T) { BaseConfig: BaseConfig{ MaxLogSize: 65536, ListenAddress: "10.0.0.1:9000", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/tmp/cert/missing", KeyFile: "/tmp/key/missing", }, diff --git a/pkg/translator/azure/go.mod b/pkg/translator/azure/go.mod index 1c1b1a12f10e..515a34fb8dd5 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.96.0 github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.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.96.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect @@ -40,7 +40,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/azure/go.sum b/pkg/translator/azure/go.sum index 9d6971b814fd..9290c0fe9705 100644 --- a/pkg/translator/azure/go.sum +++ b/pkg/translator/azure/go.sum @@ -53,16 +53,16 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -110,8 +110,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index dbd5749a9233..444d917b89aa 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/ go 1.21 require ( - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -28,7 +28,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index a2c99daf5513..a558cdc36791 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -13,8 +13,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -39,10 +39,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= @@ -86,8 +86,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index a89f432d4d94..c7bb0760d642 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -35,15 +35,15 @@ require ( github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // 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 - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index 6d5a87e094c5..9b5fdb2bc2c1 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -81,8 +81,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -97,12 +97,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= @@ -112,8 +112,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -122,10 +122,10 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -134,8 +134,8 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -152,8 +152,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index d6b39c727946..7dacb24a164b 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -4,14 +4,14 @@ go 1.21 require ( github.com/census-instrumentation/opencensus-proto v0.4.1 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 google.golang.org/protobuf v1.33.0 ) @@ -33,7 +33,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 6ef978439fb2..3e0d1edc5ead 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -30,16 +30,14 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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.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= @@ -77,10 +75,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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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,8 +147,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -160,8 +158,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 8f582814bad4..8251da7e878c 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -25,7 +25,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 2a6acd60404c..b868bf5cdbd2 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -36,10 +36,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -77,8 +77,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 216cb4f7350a..2ef934e9cdbb 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -24,12 +24,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.0 // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index b52b84970d5f..23f515046564 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -31,8 +31,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk= github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -43,12 +43,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= @@ -62,16 +62,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -86,8 +86,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index 3c5281ea2c43..ae59ea58d3ab 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.96.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -26,7 +26,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 9acd53816f46..8c0ff83d0672 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -47,8 +47,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= 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= @@ -86,8 +86,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/pkg/translator/skywalking/go.mod b/pkg/translator/skywalking/go.mod index ff01802d3eb3..dd47394585ae 100644 --- a/pkg/translator/skywalking/go.mod +++ b/pkg/translator/skywalking/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) @@ -25,7 +25,7 @@ require ( 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-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/skywalking/go.sum b/pkg/translator/skywalking/go.sum index 12f7a15f335b..c73351642f3d 100644 --- a/pkg/translator/skywalking/go.sum +++ b/pkg/translator/skywalking/go.sum @@ -83,10 +83,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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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= @@ -200,8 +200,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 89698afcf29e..8025d3916f6a 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -3,12 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/ go 1.21 require ( - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 ) @@ -29,7 +29,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index a4d6ea1ede26..d114277c2684 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -13,8 +13,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -41,10 +41,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= @@ -88,8 +88,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/attributesprocessor/README.md b/processor/attributesprocessor/README.md index de7b504b3361..e1f09e46a99a 100644 --- a/processor/attributesprocessor/README.md +++ b/processor/attributesprocessor/README.md @@ -213,8 +213,8 @@ attributes: # It is supported to have more than one specified, but all of the specified # conditions must evaluate to true for a match to occur. - # match_type controls how items in "services" and "span_names" arrays are - # interpreted. Possible values are "regexp" or "strict". + # match_type controls how items in "services", "span_names", and "attributes" + # arrays are interpreted. Possible values are "regexp" or "strict". # This is a required field. match_type: {strict, regexp} @@ -284,12 +284,12 @@ attributes: metric_names: [, ..., ] # Attributes specifies the list of attributes to match against. - # All of these attributes must match exactly for a match to occur. + # All of these attributes must match for a match to occur. # This is an optional field. attributes: # Key specifies the attribute to match against. - key: - # Value specifies the exact value to match against. + # Value specifies the value to match against. # If not specified, a match occurs if the key is present in the attributes. value: {value} ``` diff --git a/processor/attributesprocessor/generated_component_test.go b/processor/attributesprocessor/generated_component_test.go index 1bc1c863c777..c387486d4c13 100644 --- a/processor/attributesprocessor/generated_component_test.go +++ b/processor/attributesprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 237bc9aca866..4c779384be87 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -50,9 +50,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -63,7 +63,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index b228ea8900b2..f84d7d490595 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -82,24 +82,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -153,8 +153,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/cumulativetodeltaprocessor/generated_component_test.go b/processor/cumulativetodeltaprocessor/generated_component_test.go index b96b0fb5bc2c..2aeec505d542 100644 --- a/processor/cumulativetodeltaprocessor/generated_component_test.go +++ b/processor/cumulativetodeltaprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 0845d04900ad..b18aff428d6b 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -51,7 +52,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index c5af52ef604c..15f6b669c212 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/deltatocumulativeprocessor/README.md b/processor/deltatocumulativeprocessor/README.md index 1a639128fca8..e80eeb2ad441 100644 --- a/processor/deltatocumulativeprocessor/README.md +++ b/processor/deltatocumulativeprocessor/README.md @@ -25,6 +25,8 @@ processors: deltatocumulative: # how long until a series not receiving new samples is removed [ max_stale: | default = 5m ] + + # upper limit of streams to track. new streams exceeding this limit + # will be dropped + [ max_streams: | default = 0 (off) ] ``` - -There is no further configuration required. All delta samples are converted to cumulative. diff --git a/processor/deltatocumulativeprocessor/config.go b/processor/deltatocumulativeprocessor/config.go index b5744a9779b7..b97793d0b6d8 100644 --- a/processor/deltatocumulativeprocessor/config.go +++ b/processor/deltatocumulativeprocessor/config.go @@ -13,12 +13,26 @@ import ( var _ component.ConfigValidator = (*Config)(nil) type Config struct { - MaxStale time.Duration `json:"max_stale"` + MaxStale time.Duration `mapstructure:"max_stale"` + MaxStreams int `mapstructure:"max_streams"` } func (c *Config) Validate() error { if c.MaxStale <= 0 { return fmt.Errorf("max_stale must be a positive duration (got %s)", c.MaxStale) } + if c.MaxStreams < 0 { + return fmt.Errorf("max_streams must be a positive number (got %d)", c.MaxStreams) + } return nil } + +func createDefaultConfig() component.Config { + return &Config{ + MaxStale: 5 * time.Minute, + + // disable. TODO: find good default + // https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31603 + MaxStreams: 0, + } +} diff --git a/processor/deltatocumulativeprocessor/config_test.go b/processor/deltatocumulativeprocessor/config_test.go new file mode 100644 index 000000000000..79348b2aa6a7 --- /dev/null +++ b/processor/deltatocumulativeprocessor/config_test.go @@ -0,0 +1,65 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package deltatocumulativeprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor" + +import ( + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/confmaptest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/metadata" +) + +func TestLoadConfig(t *testing.T) { + t.Parallel() + + cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) + require.NoError(t, err) + + tests := []struct { + id component.ID + expected component.Config + }{ + { + id: component.NewIDWithName(metadata.Type, "all"), + expected: &Config{ + MaxStale: 1 * time.Minute, + MaxStreams: 10, + }, + }, + { + id: component.NewIDWithName(metadata.Type, "set-valid-max_stale"), + expected: &Config{ + MaxStale: 2 * time.Minute, + MaxStreams: 0, + }, + }, + { + id: component.NewIDWithName(metadata.Type, "set-valid-max_streams"), + expected: &Config{ + MaxStale: 5 * time.Minute, + MaxStreams: 20, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.id.String(), func(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + + sub, err := cm.Sub(tt.id.String()) + require.NoError(t, err) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) + + assert.NoError(t, component.ValidateConfig(cfg)) + assert.Equal(t, tt.expected, cfg) + }) + } +} diff --git a/processor/deltatocumulativeprocessor/factory.go b/processor/deltatocumulativeprocessor/factory.go index b2fba4e00fc2..47b968d14f17 100644 --- a/processor/deltatocumulativeprocessor/factory.go +++ b/processor/deltatocumulativeprocessor/factory.go @@ -6,7 +6,6 @@ package deltatocumulativeprocessor // import "github.com/open-telemetry/opentele import ( "context" "fmt" - "time" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" @@ -23,10 +22,6 @@ func NewFactory() processor.Factory { ) } -func createDefaultConfig() component.Config { - return &Config{MaxStale: 5 * time.Minute} -} - func createMetricsProcessor(_ context.Context, set processor.CreateSettings, cfg component.Config, next consumer.Metrics) (processor.Metrics, error) { pcfg, ok := cfg.(*Config) if !ok { diff --git a/processor/deltatocumulativeprocessor/generated_component_test.go b/processor/deltatocumulativeprocessor/generated_component_test.go index a71882b6d0ca..b231fe3cb975 100644 --- a/processor/deltatocumulativeprocessor/generated_component_test.go +++ b/processor/deltatocumulativeprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/deltatocumulativeprocessor/go.mod b/processor/deltatocumulativeprocessor/go.mod index 3fb1d71cdd7e..4525a9cbca2e 100644 --- a/processor/deltatocumulativeprocessor/go.mod +++ b/processor/deltatocumulativeprocessor/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -38,8 +39,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -49,7 +50,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/deltatocumulativeprocessor/go.sum b/processor/deltatocumulativeprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/deltatocumulativeprocessor/go.sum +++ b/processor/deltatocumulativeprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/deltatocumulativeprocessor/internal/clock/clock.go b/processor/deltatocumulativeprocessor/internal/clock/clock.go deleted file mode 100644 index 3c010136e97f..000000000000 --- a/processor/deltatocumulativeprocessor/internal/clock/clock.go +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package clock // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/clock" - -import ( - "sync" - "time" -) - -var clock Clock = Real{} - -func Change(c Clock) { - clock = c -} - -type Clock interface { - Now() time.Time - After(d time.Duration) <-chan time.Time -} - -func Now() time.Time { - return clock.Now() -} - -func After(d time.Duration) <-chan time.Time { - return clock.After(d) -} - -func Until(t time.Time) time.Duration { - return t.Sub(Now()) -} - -func Sleep(d time.Duration) { - <-After(d) -} - -type Real struct{} - -func (r Real) Now() time.Time { - return time.Now() -} - -func (r Real) After(d time.Duration) <-chan time.Time { - return time.After(d) -} - -type Settable interface { - Clock - Set(now time.Time) -} - -func Fake() Settable { - clock := &fake{} - clock.Set(time.Time{}) - return clock -} - -type fake struct { - mtx sync.RWMutex - ts time.Time -} - -func (f *fake) Set(now time.Time) { - f.mtx.Lock() - f.ts = now - f.mtx.Unlock() -} - -func (f *fake) Now() time.Time { - f.mtx.RLock() - defer f.mtx.RUnlock() - return f.ts -} - -func (f *fake) After(d time.Duration) <-chan time.Time { - var ( - end = f.Now().Add(d) - done = make(chan time.Time) - wait = make(chan struct{}) - ) - - go func() { - close(wait) - for f.Now().Before(end) { - time.Sleep(time.Millisecond / 10) - } - done <- f.Now() - close(done) - }() - <-wait - - return done -} diff --git a/processor/deltatocumulativeprocessor/internal/clock/clock_test.go b/processor/deltatocumulativeprocessor/internal/clock/clock_test.go deleted file mode 100644 index d1671a683ff3..000000000000 --- a/processor/deltatocumulativeprocessor/internal/clock/clock_test.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package clock - -import ( - "testing" - "time" - - "github.com/stretchr/testify/require" -) - -func TestFakeAfter(t *testing.T) { - fake := Fake() - - ch := fake.After(10 * time.Second) - now := fake.Now() - - fake.Set(now.Add(10 * time.Second)) - done := <-ch - - require.Equal(t, 10*time.Second, done.Sub(now)) -} - -func TestFakeSet(t *testing.T) { - fake := Fake() - require.Equal(t, time.Time{}, fake.Now()) - - ts := time.Time{}.Add(10 * time.Minute) - fake.Set(ts) - require.Equal(t, ts, fake.Now()) -} diff --git a/processor/deltatocumulativeprocessor/internal/streams/expiry.go b/processor/deltatocumulativeprocessor/internal/streams/expiry.go deleted file mode 100644 index 37d2c97ede28..000000000000 --- a/processor/deltatocumulativeprocessor/internal/streams/expiry.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package streams // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/streams" - -import ( - "time" - - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/staleness" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/streams" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/clock" -) - -func ExpireAfter[T any](items streams.Map[T], ttl time.Duration) Expiry[T] { - exp := Expiry[T]{ - Staleness: *staleness.NewStaleness[T](ttl, items), - sig: make(chan struct{}), - } - return exp -} - -var _ streams.Map[any] = (*Expiry[any])(nil) - -type Expiry[T any] struct { - staleness.Staleness[T] - sig chan struct{} -} - -func (e Expiry[T]) ExpireOldEntries() <-chan struct{} { - e.Staleness.ExpireOldEntries() - - n := e.Staleness.Len() - sig := make(chan struct{}) - - go func() { - switch { - case n == 0: - <-e.sig - case n > 0: - expires := e.Staleness.Next().Add(e.Max) - until := clock.Until(expires) - clock.Sleep(until) - } - close(sig) - }() - return sig -} - -func (e Expiry[T]) Store(id identity.Stream, v T) error { - err := e.Staleness.Store(id, v) - - // "try-send" to notify possibly sleeping expiry routine - select { - case e.sig <- struct{}{}: - default: - } - - return err -} diff --git a/processor/deltatocumulativeprocessor/internal/streams/expiry_test.go b/processor/deltatocumulativeprocessor/internal/streams/expiry_test.go deleted file mode 100644 index c415f6baf2df..000000000000 --- a/processor/deltatocumulativeprocessor/internal/streams/expiry_test.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package streams_test - -import ( - "math/rand" - "sync" - "testing" - "time" - - "github.com/stretchr/testify/require" - - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/staleness" - exp "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/streams" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/clock" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/streams" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/testdata/random" -) - -func TestExpiry(t *testing.T) { - fake := clock.Fake() - clock.Change(fake) - staleness.NowFunc = func() time.Time { return fake.Now() } - - tm := TimeMap[data.Number]{ - Map: make(exp.HashMap[data.Number]), - add: make(map[identity.Stream]time.Time), - del: make(map[identity.Stream]time.Time), - } - const maxStale = time.Minute - exp := streams.ExpireAfter(tm, maxStale) - - var mtx sync.Mutex - go func() { - for { - mtx.Lock() - next := exp.ExpireOldEntries() - mtx.Unlock() - <-next - } - }() - - sum := random.Sum() - mtx.Lock() - now := fake.Now() - for i := 0; i < 10; i++ { - r := rand.Intn(10) - now = now.Add(time.Duration(r) * time.Second) - fake.Set(now) - - id, dp := sum.Stream() - err := exp.Store(id, dp) - require.NoError(t, err) - } - mtx.Unlock() - - go func() { - for { - now = now.Add(time.Second) - fake.Set(now) - time.Sleep(2 * time.Millisecond) - } - }() - - for { - mtx.Lock() - n := tm.Len() - mtx.Unlock() - if n == 0 { - break - } - time.Sleep(10 * time.Millisecond) - } - - for id := range tm.add { - add := tm.add[id] - del := tm.del[id] - require.Equal(t, maxStale, del.Sub(add)) - } -} - -type TimeMap[T any] struct { - streams.Map[T] - - add map[streams.Ident]time.Time - del map[streams.Ident]time.Time -} - -func (t TimeMap[T]) Store(id streams.Ident, v T) error { - t.add[id] = clock.Now() - return t.Map.Store(id, v) -} - -func (t TimeMap[T]) Delete(id streams.Ident) { - t.del[id] = clock.Now() - t.Map.Delete(id) -} diff --git a/processor/deltatocumulativeprocessor/internal/streams/limit.go b/processor/deltatocumulativeprocessor/internal/streams/limit.go new file mode 100644 index 000000000000..0378960ee657 --- /dev/null +++ b/processor/deltatocumulativeprocessor/internal/streams/limit.go @@ -0,0 +1,63 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package streams // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/streams" + +import ( + "errors" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/streams" +) + +func Limit[T any](m Map[T], max int) LimitMap[T] { + return LimitMap[T]{Map: m, Max: max} +} + +type LimitMap[T any] struct { + Max int + + Evictor streams.Evictor + streams.Map[T] +} + +func (m LimitMap[T]) Store(id identity.Stream, v T) error { + if m.Map.Len() < m.Max { + return m.Map.Store(id, v) + } + + errl := ErrLimit(m.Max) + if m.Evictor != nil { + gone := m.Evictor.Evict() + if err := m.Map.Store(id, v); err != nil { + return err + } + return ErrEvicted{ErrLimit: errl, id: gone} + } + return errl +} + +type ErrLimit int + +func (e ErrLimit) Error() string { + return fmt.Sprintf("stream limit of %d reached", e) +} + +func AtLimit(err error) bool { + var errLimit ErrLimit + return errors.As(err, &errLimit) +} + +type ErrEvicted struct { + ErrLimit + id Ident +} + +func (e ErrEvicted) Error() string { + return fmt.Sprintf("%s. evicted stream %s", e.ErrLimit, e.id) +} + +func (e ErrEvicted) Unwrap() error { + return e.ErrLimit +} diff --git a/processor/deltatocumulativeprocessor/internal/streams/limit_test.go b/processor/deltatocumulativeprocessor/internal/streams/limit_test.go new file mode 100644 index 000000000000..d0c5af6e5666 --- /dev/null +++ b/processor/deltatocumulativeprocessor/internal/streams/limit_test.go @@ -0,0 +1,51 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package streams_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity" + exp "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/streams" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/streams" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/testdata/random" +) + +func TestLimit(t *testing.T) { + sum := random.Sum() + + items := make(exp.HashMap[data.Number]) + lim := streams.Limit(items, 10) + + ids := make([]identity.Stream, 10) + + // write until limit must work + for i := 0; i < 10; i++ { + id, dp := sum.Stream() + ids[i] = id + err := lim.Store(id, dp) + require.NoError(t, err) + } + + // one over limit must be rejected + { + id, dp := sum.Stream() + err := lim.Store(id, dp) + want := streams.ErrLimit(10) + require.ErrorAs(t, err, &want) + require.True(t, streams.AtLimit(err)) + } + + // after removing one, must be accepted again + { + lim.Delete(ids[0]) + + id, dp := sum.Stream() + err := lim.Store(id, dp) + require.NoError(t, err) + } +} diff --git a/processor/deltatocumulativeprocessor/internal/streams/streams.go b/processor/deltatocumulativeprocessor/internal/streams/streams.go index c6f725c7bfa2..1b34f806b272 100644 --- a/processor/deltatocumulativeprocessor/internal/streams/streams.go +++ b/processor/deltatocumulativeprocessor/internal/streams/streams.go @@ -33,3 +33,5 @@ func (a MapAggr[D]) Aggregate(id Ident, dp D) (D, error) { v, _ := a.Map.Load(id) return v, err } + +type Evictor = streams.Evictor diff --git a/processor/deltatocumulativeprocessor/processor.go b/processor/deltatocumulativeprocessor/processor.go index 8f5941ce84b1..f6e886abbefb 100644 --- a/processor/deltatocumulativeprocessor/processor.go +++ b/processor/deltatocumulativeprocessor/processor.go @@ -7,6 +7,7 @@ import ( "context" "errors" "sync" + "time" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" @@ -14,6 +15,7 @@ import ( "go.opentelemetry.io/collector/processor" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/staleness" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/delta" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/metrics" @@ -29,8 +31,8 @@ type Processor struct { ctx context.Context cancel context.CancelFunc - aggr streams.Aggregator[data.Number] - exp *streams.Expiry[data.Number] + aggr streams.Aggregator[data.Number] + stale *staleness.Staleness[data.Number] mtx sync.Mutex } @@ -49,9 +51,16 @@ func newProcessor(cfg *Config, log *zap.Logger, next consumer.Metrics) *Processo dps = delta.New[data.Number]() if cfg.MaxStale > 0 { - exp := streams.ExpireAfter(dps, cfg.MaxStale) - proc.exp = &exp - dps = &exp + stale := staleness.NewStaleness(cfg.MaxStale, dps) + proc.stale = stale + dps = stale + } + if cfg.MaxStreams > 0 { + lim := streams.Limit(dps, cfg.MaxStreams) + if proc.stale != nil { + lim.Evictor = proc.stale + } + dps = lim } proc.aggr = streams.IntoAggregator(dps) @@ -59,22 +68,23 @@ func newProcessor(cfg *Config, log *zap.Logger, next consumer.Metrics) *Processo } func (p *Processor) Start(_ context.Context, _ component.Host) error { - if p.exp != nil { - go func() { - for { + if p.stale == nil { + return nil + } + + go func() { + tick := time.NewTicker(time.Minute) + for { + select { + case <-p.ctx.Done(): + return + case <-tick.C: p.mtx.Lock() - next := p.exp.ExpireOldEntries() + p.stale.ExpireOldEntries() p.mtx.Unlock() - - select { - case <-next: - case <-p.ctx.Done(): - return - } } - }() - } - + } + }() return nil } diff --git a/processor/deltatocumulativeprocessor/testdata/config.yaml b/processor/deltatocumulativeprocessor/testdata/config.yaml new file mode 100644 index 000000000000..28e34bde5c7b --- /dev/null +++ b/processor/deltatocumulativeprocessor/testdata/config.yaml @@ -0,0 +1,7 @@ +deltatocumulative/all: + max_stale: 1m + max_streams: 10 +deltatocumulative/set-valid-max_stale: + max_stale: 2m +deltatocumulative/set-valid-max_streams: + max_streams: 20 diff --git a/processor/deltatorateprocessor/generated_component_test.go b/processor/deltatorateprocessor/generated_component_test.go index 7ff3da5a92e9..903565be5c75 100644 --- a/processor/deltatorateprocessor/generated_component_test.go +++ b/processor/deltatorateprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 4a5db8676191..a2ff13b40d1b 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -48,7 +49,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/filterprocessor/README.md b/processor/filterprocessor/README.md index dae15f0e8d92..0ccf62e5e79c 100644 --- a/processor/filterprocessor/README.md +++ b/processor/filterprocessor/README.md @@ -84,36 +84,55 @@ processors: - 'severity_number < SEVERITY_NUMBER_WARN' ``` -#### Dropping non-HTTP spans +#### Dropping data based on a resource attribute ```yaml processors: - filter/httponly: + filter: error_mode: ignore traces: span: - - attributes["http.request.method"] == nil + - IsMatch(resource.attributes["k8s.pod.name"], "my-pod-name.*") ``` -#### Dropping HTTP spans +#### Dropping metrics with invalid type ```yaml processors: - filter/drophttp: + filter: error_mode: ignore - traces: - span: - - attributes["http.request.method"] != nil + metrics: + metric: + - type == METRIC_DATA_TYPE_NONE ``` -#### Dropping metrics with invalid type +#### Dropping specific metric and value ```yaml processors: - filter/dropempty: + filter: error_mode: ignore metrics: - metric: - - type == METRIC_DATA_TYPE_NONE + datapoint: + - metric.name == "k8s.pod.phase" && value_int == 4 ``` +#### Dropping non-HTTP spans +```yaml +processors: + filter: + error_mode: ignore + traces: + span: + - attributes["http.request.method"] == nil +``` + +#### Dropping HTTP spans +```yaml +processors: + filter: + error_mode: ignore + traces: + span: + - attributes["http.request.method"] != nil +``` ### OTTL Functions @@ -147,293 +166,6 @@ Examples: - `HasAttrOnDatapoint("http.method", "GET")` -## Alternative Config Options - -All the following configurations can be expressed using OTTL configuration -and may eventually be deprecated as part of [#18642](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/18642). - -The filter processor can be configured to include or exclude: - -- Logs, based on resource attributes using the `strict` or `regexp` match types -- Metrics based on metric name in the case of the `strict` or `regexp` match types, - or based on other metric attributes in the case of the `expr` match type. - Please refer to [config.go](./config.go) for the config spec. -- Spans based on span names and resource attributes, all with full regex support - -It takes a pipeline type, of which `logs` `metrics`, and `traces` are supported, followed -by an action: - -- `include`: Any names NOT matching filters are excluded from remainder of pipeline -- `exclude`: Any names matching filters are excluded from remainder of pipeline - -For the actions the following parameters are required: - -For logs: - -- `match_type`: `strict`|`regexp` -- `resource_attributes`: ResourceAttributes defines a list of possible resource - attributes to match logs against. - A match occurs if any resource attribute matches all expressions in this given list. -- `record_attributes`: RecordAttributes defines a list of possible record - attributes to match logs against. - A match occurs if any record attribute matches all expressions in this given list. -- `severity_texts`: SeverityTexts defines a list of possible severity texts to match the logs against. - A match occurs if the record matches any expression in this given list. -- `bodies`: Bodies defines a list of possible log bodies to match the logs against. - A match occurs if the record matches any expression in this given list. -- `severity_number`: SeverityNumber defines how to match a record based on its SeverityNumber. - The following can be configured for matching a log record's SeverityNumber: - - `min`: Min defines the minimum severity with which a log record should match. - e.g. if this is "WARN", all log records with "WARN" severity and above (WARN[2-4], ERROR[2-4], FATAL[2-4]) are matched. - The list of valid severities that may be used for this option can be found [here](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#displaying-severity). You may use either the numerical "SeverityNumber" or the "Short Name" - - `match_undefined`: MatchUndefinedSeverity defines whether to match logs with undefined severity or not when using the `min_severity` matching option. - By default, this is `false`. - -For metrics: - -- `match_type`: `strict`|`regexp`|`expr` -- `metric_names`: (only for a `match_type` of `strict` or `regexp`) list of strings - or re2 regex patterns -- `expressions`: (only for a `match_type` of `expr`) list of `expr` expressions - (see "Using an `expr` match_type" below) -- `resource_attributes`: ResourceAttributes defines a list of possible resource - attributes to match metrics against. - A match occurs if any resource attribute matches all expressions in this given list. - -This processor uses [re2 regex][re2_regex] for regex syntax. - -[re2_regex]: https://github.com/google/re2/wiki/Syntax - -More details can be found at [include/exclude metrics](../attributesprocessor/README.md#includeexclude-filtering). - -Examples: - -```yaml -processors: - filter/1: - metrics: - include: - match_type: regexp - metric_names: - - prefix/.* - - prefix_.* - resource_attributes: - - key: container.name - value: app_container_1 - exclude: - match_type: strict - metric_names: - - hello_world - - hello/world - filter/2: - logs: - include: - match_type: strict - resource_attributes: - - key: host.name - value: just_this_one_hostname - filter/regexp: - logs: - include: - match_type: regexp - resource_attributes: - - key: host.name - value: prefix.* - filter/regexp_record: - logs: - include: - match_type: regexp - record_attributes: - - key: record_attr - value: prefix_.* - # Filter on severity text field - filter/severity_text: - logs: - include: - match_type: regexp - severity_texts: - - INFO[2-4]? - - WARN[2-4]? - - ERROR[2-4]? - # Filter out logs below INFO (no DEBUG or TRACE level logs), - # retaining logs with undefined severity - filter/severity_number: - logs: - include: - severity_number: - min: "INFO" - match_undefined: true - filter/bodies: - logs: - include: - match_type: regexp - bodies: - - ^IMPORTANT RECORD -``` - -Refer to the config files in [testdata](./testdata) for detailed -examples on using the processor. - -### Using an "expr" match_type - -In addition to matching metric names with the `strict` or `regexp` match types, the filter processor -supports matching entire `Metric`s using the [expr](https://github.com/antonmedv/expr) expression engine. - -The `expr` filter evaluates the supplied boolean expressions _per datapoint_ on a metric, and returns a result -for the entire metric. If any datapoint evaluates to true then the entire metric evaluates to true, otherwise -false. - -Made available to the expression environment are the following: - -* `MetricName` - a variable containing the current Metric's name -* `MetricType` - a variable containing the current Metric's type: "Gauge", "Sum", "Histogram", "ExponentialHistogram" or "Summary". -* `Label(name)` - a function that takes a label name string as an argument and returns a string: the value of a label with that - name if one exists, or "" -* `HasLabel(name)` - a function that takes a label name string as an argument and returns a boolean: true if the datapoint has a label - with that name, false otherwise - -Example: - -```yaml -processors: - filter/1: - metrics: - exclude: - match_type: expr - expressions: - - MetricName == "my.metric" && Label("my_label") == "abc123" - - MetricType == "Histogram" -``` - -The above config will filter out any Metric that both has the name "my.metric" and has at least one datapoint -with a label of 'my_label="abc123"'. - -### Support for multiple expressions - -As with `strict` and `regexp`, multiple `expr` expressions are allowed. - -For example, the following two filters have the same effect: they filter out metrics named "system.cpu.time" and -"system.disk.io". - -```yaml -processors: - filter/expr: - metrics: - exclude: - match_type: expr - expressions: - - MetricName == "system.cpu.time" - - MetricName == "system.disk.io" - filter/strict: - metrics: - exclude: - match_type: strict - metric_names: - - system.cpu.time - - system.disk.io -``` - -The expressions are effectively ORed per datapoint. So for the above `expr` configuration, given a datapoint, if its -parent Metric's name is "system.cpu.time" or "system.disk.io" then there's a match. The conditions are tested against -all the datapoints in a Metric until there's a match, in which case the entire Metric is considered a match, and in -the above example the Metric will be excluded. If after testing all the datapoints in a Metric against all the -expressions there isn't a match, the entire Metric is considered to be not matching. - - -### Filter metrics using resource attributes -In addition to the names, metrics can be filtered using resource attributes. `resource_attributes` takes a list of resource attributes to filter metrics against. - -Following example will include only the metrics coming from `app_container_1` (the value for `container.name` resource attribute is `app_container_1`). - -```yaml -processors: - filter/resource_attributes_include: - metrics: - include: - match_type: strict - metric_names: - - hello_world - - hello/world - resource_attributes: - - key: container.name - value: app_container_1 -``` - -Following example will exclude all the metrics coming from `app_container_1` (the value for `container.name` resource attribute is `app_container_1`). - -```yaml -processors: - filter/resource_attributes_exclude: - metrics: - exclude: - match_type: strict - metric_names: - - hello_world - - hello/world - resource_attributes: - - key: container.name - value: app_container_1 -``` - -We can also use `regexp` to filter metrics using resource attributes. Following example will include only the metrics coming from `app_container_1` or `app_container_2` (the value for `container.name` resource attribute is either `app_container_1` or `app_container_2`). - -```yaml -processors: - filter/resource_attributes_regexp: - metrics: - exclude: - match_type: regexp - metric_names: - - hello_world - - hello/world - resource_attributes: - - key: container.name - value: (app_container_1|app_container_1) -``` - -In case the no metric names are provided, `matric_names` being empty, the filtering is only done at resource level. - -### Filter Spans from Traces - -* This pipeline is able to drop spans and whole traces -* Note: If this drops a parent span, it does not search out it's children leading to a missing Span in your trace visualization - -See the documentation in the [attribute processor](../attributesprocessor/README.md) for syntax - -For spans, one of Services, SpanNames, Attributes, Resources or Libraries must be specified with a -non-empty value for a valid configuration. - -```yaml -processors: - filter/spans: - spans: - include: - match_type: strict - services: - - app_3 - exclude: - match_type: regexp - services: - - app_1 - - app_2 - span_names: - - hello_world - - hello/world - attributes: - - key: container.name - value: (app_container_1|app_container_2) - libraries: - - name: opentelemetry - version: 0.0-beta - resources: - - key: container.host - value: (localhost|127.0.0.1) -``` - ## Warnings In general, understand your data before using the filter processor. diff --git a/processor/filterprocessor/generated_component_test.go b/processor/filterprocessor/generated_component_test.go index 3ac5aab6b0cb..855f7e947b12 100644 --- a/processor/filterprocessor/generated_component_test.go +++ b/processor/filterprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index dbf107c68253..8c476930dff7 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -51,10 +51,10 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect @@ -62,7 +62,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index b228ea8900b2..f84d7d490595 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -82,24 +82,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -153,8 +153,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/groupbyattrsprocessor/generated_component_test.go b/processor/groupbyattrsprocessor/generated_component_test.go index 075254f73c76..8c3deeabaf78 100644 --- a/processor/groupbyattrsprocessor/generated_component_test.go +++ b/processor/groupbyattrsprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 149e901b8419..2656c92eafef 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -49,7 +50,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/groupbytraceprocessor/generated_component_test.go b/processor/groupbytraceprocessor/generated_component_test.go index a0503864b72d..08a8b70f0bf2 100644 --- a/processor/groupbytraceprocessor/generated_component_test.go +++ b/processor/groupbytraceprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index a5787829b3d9..71230b1c6316 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -39,8 +40,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -49,7 +50,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 52070936080a..adcaaae9a56a 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -50,6 +50,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -99,20 +101,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -191,8 +193,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/processor/intervalprocessor/generated_component_test.go b/processor/intervalprocessor/generated_component_test.go index 1bef7864d369..6e4b8a8e33cb 100644 --- a/processor/intervalprocessor/generated_component_test.go +++ b/processor/intervalprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/intervalprocessor/go.mod b/processor/intervalprocessor/go.mod index ebda94ea7f6e..bee388b3458e 100644 --- a/processor/intervalprocessor/go.mod +++ b/processor/intervalprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/intervalprocessor/go.sum b/processor/intervalprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/intervalprocessor/go.sum +++ b/processor/intervalprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/k8sattributesprocessor/README.md b/processor/k8sattributesprocessor/README.md index edce0ed2461e..c9cc6b7842e0 100644 --- a/processor/k8sattributesprocessor/README.md +++ b/processor/k8sattributesprocessor/README.md @@ -159,7 +159,9 @@ k8sattributes/2: ## Role-based access control -The k8sattributesprocessor needs `get`, `watch` and `list` permissions on both `pods` and `namespaces` resources, for all namespaces and pods included in the configured filters. Additionally, when using `k8s.deployment.uid` or `k8s.deployment.name` the processor also needs `get`, `watch` and `list` permissions for `replicasets` resources. When extracting metadatas from `node`, the processor needs `get`, `watch` and `list` permissions for `nodes` resources. +## Cluster-scoped RBAC + +If you'd like to set up the k8sattributesprocessor to receive telemetry from across namespaces, it will need `get`, `watch` and `list` permissions on both `pods` and `namespaces` resources, for all namespaces and pods included in the configured filters. Additionally, when using `k8s.deployment.uid` or `k8s.deployment.name` the processor also needs `get`, `watch` and `list` permissions for `replicasets` resources. When using `k8s.node.uid` or extracting metadata from `node`, the processor needs `get`, `watch` and `list` permissions for `nodes` resources. Here is an example of a `ClusterRole` to give a `ServiceAccount` the necessary permissions for all pods, nodes, and namespaces in the cluster (replace `` with a namespace where collector is deployed): @@ -199,6 +201,51 @@ roleRef: apiGroup: rbac.authorization.k8s.io ``` +### Namespace-scoped RBAC +When running the k8sattributesprocessor to receive telemetry traffic from pods in a specific namespace, you can use a k8s `Role` and `Rolebinding` to provide collector access to query pods and replicasets in the namespace. This would require setting the `filter::namespace` config as shown below. +```yaml +k8sattributes: + filter: + namespace: +``` +With the namespace filter set, the processor will only look up pods and replicasets in the selected namespace. Note that with just a role binding, the processor can not query metadata such as labels and annotations from k8s `nodes` and `namespaces` which are cluster-scoped objects. This also means that the processor can not set the value for `k8s.cluster.uid` attribute if enabled, since the `k8s.cluster.uid` attribute is set to the uid of the namespace `kube-system` which is not queryable with namespaced rbac. + +Example `Role` and `RoleBinding` to create in the namespace being watched. +```yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + name: otel-collector + namespace: +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: otel-collector + namespace: +rules: +- apiGroups: [""] + resources: ["pods"] + verbs: ["get", "watch", "list"] +- apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: otel-collector + namespace: +subjects: +- kind: ServiceAccount + name: otel-collector + namespace: +roleRef: + kind: Role + name: otel-collector + apiGroup: rbac.authorization.k8s.io +``` + ## Deployment scenarios The processor can be used in collectors deployed both as an agent (Kubernetes DaemonSet) or as a gateway (Kubernetes Deployment). diff --git a/processor/k8sattributesprocessor/config.go b/processor/k8sattributesprocessor/config.go index 44323b1baebf..809ff4fe301f 100644 --- a/processor/k8sattributesprocessor/config.go +++ b/processor/k8sattributesprocessor/config.go @@ -84,12 +84,17 @@ func (cfg *Config) Validate() error { for _, field := range cfg.Extract.Metadata { switch field { case conventions.AttributeK8SNamespaceName, conventions.AttributeK8SPodName, conventions.AttributeK8SPodUID, - specPodHostName, metadataPodStartTime, conventions.AttributeK8SDeploymentName, conventions.AttributeK8SDeploymentUID, - conventions.AttributeK8SReplicaSetName, conventions.AttributeK8SReplicaSetUID, conventions.AttributeK8SDaemonSetName, - conventions.AttributeK8SDaemonSetUID, conventions.AttributeK8SStatefulSetName, conventions.AttributeK8SStatefulSetUID, - conventions.AttributeK8SContainerName, conventions.AttributeK8SJobName, conventions.AttributeK8SJobUID, - conventions.AttributeK8SCronJobName, conventions.AttributeK8SNodeName, conventions.AttributeContainerID, - conventions.AttributeContainerImageName, conventions.AttributeContainerImageTag, clusterUID: + specPodHostName, metadataPodStartTime, + conventions.AttributeK8SDeploymentName, conventions.AttributeK8SDeploymentUID, + conventions.AttributeK8SReplicaSetName, conventions.AttributeK8SReplicaSetUID, + conventions.AttributeK8SDaemonSetName, conventions.AttributeK8SDaemonSetUID, + conventions.AttributeK8SStatefulSetName, conventions.AttributeK8SStatefulSetUID, + conventions.AttributeK8SJobName, conventions.AttributeK8SJobUID, + conventions.AttributeK8SCronJobName, + conventions.AttributeK8SNodeName, conventions.AttributeK8SNodeUID, + conventions.AttributeK8SContainerName, conventions.AttributeContainerID, + conventions.AttributeContainerImageName, conventions.AttributeContainerImageTag, + clusterUID: default: return fmt.Errorf("\"%s\" is not a supported metadata field", field) } diff --git a/processor/k8sattributesprocessor/e2e_test.go b/processor/k8sattributesprocessor/e2e_test.go index b80e9e38bf74..9057ce96c06f 100644 --- a/processor/k8sattributesprocessor/e2e_test.go +++ b/processor/k8sattributesprocessor/e2e_test.go @@ -8,6 +8,8 @@ package k8sattributesprocessor import ( "context" "fmt" + "os" + "path/filepath" "regexp" "testing" "time" @@ -22,8 +24,6 @@ import ( "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/multierr" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/tools/clientcmd" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" ) @@ -32,10 +32,11 @@ const ( equal = iota regex exist + testKubeConfig = "/tmp/kube-config-otelcol-e2e-testing" + uidRe = "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}" + startTimeRe = "^\\\\d{4}-\\\\d{2}-\\\\d{2}T\\\\d{2}%3A\\\\d{2}%3A\\\\d{2}(?:%2E\\\\d+)?[A-Z]?(?:[+.-](?:08%3A\\\\d{2}|\\\\d{2}[A-Z]))?$" ) -const testKubeConfig = "/tmp/kube-config-otelcol-e2e-testing" - type expectedValue struct { mode int value string @@ -48,20 +49,32 @@ func newExpectedValue(mode int, value string) *expectedValue { } } -// TestE2E tests the k8s attributes processor with a real k8s cluster. +// TestE2E_ClusterRBAC tests the k8s attributes processor in a k8s cluster with the collector's service account having +// cluster-wide permissions to list/watch namespaces, nodes, pods and replicasets. The config in the test does not +// set filter::namespace. // The test requires a prebuilt otelcontribcol image uploaded to a kind k8s cluster defined in // `/tmp/kube-config-otelcol-e2e-testing`. Run the following command prior to running the test locally: // // kind create cluster --kubeconfig=/tmp/kube-config-otelcol-e2e-testing // make docker-otelcontribcol // KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image otelcontribcol:latest -func TestE2E(t *testing.T) { +func TestE2E_ClusterRBAC(t *testing.T) { + testDir := filepath.Join("testdata", "e2e", "clusterrbac") - kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) - require.NoError(t, err) - dynamicClient, err := dynamic.NewForConfig(kubeConfig) + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) require.NoError(t, err) + nsFile := filepath.Join(testDir, "namespace.yaml") + buf, err := os.ReadFile(nsFile) + require.NoErrorf(t, err, "failed to read namespace object file %s", nsFile) + nsObj, err := k8stest.CreateObject(k8sClient, buf) + require.NoErrorf(t, err, "failed to create k8s namespace from file %s", nsFile) + + testNs := nsObj.GetName() + defer func() { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, nsObj), "failed to delete namespace %s", testNs) + }() + metricsConsumer := new(consumertest.MetricsSink) tracesConsumer := new(consumertest.TracesSink) logsConsumer := new(consumertest.LogsSink) @@ -69,16 +82,22 @@ func TestE2E(t *testing.T) { defer shutdownSinks() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, dynamicClient, testID) - telemetryGenObjs, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, dynamicClient, testID) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + createTeleOpts := &k8stest.TelemetrygenCreateOpts{ + ManifestsDir: filepath.Join(testDir, "telemetrygen"), + TestID: testID, + OtlpEndpoint: fmt.Sprintf("otelcol-%s.%s:4317", testID, testNs), + DataTypes: []string{"metrics", "logs", "traces"}, + } + telemetryGenObjs, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, k8sClient, createTeleOpts) defer func() { for _, obj := range append(collectorObjs, telemetryGenObjs...) { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } }() for _, info := range telemetryGenObjInfos { - k8stest.WaitForTelemetryGenToStart(t, dynamicClient, info.Namespace, info.PodLabelSelectors, info.Workload, info.DataType) + k8stest.WaitForTelemetryGenToStart(t, k8sClient, info.Namespace, info.PodLabelSelectors, info.Workload, info.DataType) } wantEntries := 128 // Minimal number of metrics/traces/logs to wait for. @@ -95,22 +114,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeTraces, service: "test-traces-job", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-job-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-job"), - "k8s.job.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "job"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-job"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-job-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-job"), + "k8s.job.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "job"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-job"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -118,22 +138,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeTraces, service: "test-traces-statefulset", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset-0"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset"), - "k8s.statefulset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset-0"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset"), + "k8s.statefulset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -141,23 +162,24 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeTraces, service: "test-traces-deployment", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), - "k8s.deployment.uid": newExpectedValue(exist, ""), - "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*"), - "k8s.replicaset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "deployment"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), + "k8s.deployment.uid": newExpectedValue(exist, ""), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -165,22 +187,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeTraces, service: "test-traces-daemonset", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-daemonset-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-daemonset"), - "k8s.daemonset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-daemonset"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-daemonset-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-daemonset"), + "k8s.daemonset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-daemonset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -188,22 +211,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeMetrics, service: "test-metrics-job", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-job-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-job"), - "k8s.job.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "job"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-job"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-job-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-job"), + "k8s.job.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "job"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-job"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -211,22 +235,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeMetrics, service: "test-metrics-statefulset", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset-0"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset"), - "k8s.statefulset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset-0"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset"), + "k8s.statefulset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -234,23 +259,24 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeMetrics, service: "test-metrics-deployment", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), - "k8s.deployment.uid": newExpectedValue(exist, ""), - "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*"), - "k8s.replicaset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "deployment"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), + "k8s.deployment.uid": newExpectedValue(exist, ""), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -258,22 +284,23 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeMetrics, service: "test-metrics-daemonset", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-daemonset-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-daemonset"), - "k8s.daemonset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-daemonset"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-daemonset-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-daemonset"), + "k8s.daemonset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-daemonset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), }, }, { @@ -281,41 +308,208 @@ func TestE2E(t *testing.T) { dataType: component.DataTypeLogs, service: "test-logs-job", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-job-[a-z0-9]*"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-job-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), + "k8s.job.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "job"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + }, + }, + { + name: "logs-statefulset", + dataType: component.DataTypeLogs, + service: "test-logs-statefulset", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset-0"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), + "k8s.statefulset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + }, + }, + { + name: "logs-deployment", + dataType: component.DataTypeLogs, + service: "test-logs-deployment", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), + "k8s.deployment.uid": newExpectedValue(exist, ""), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + }, + }, + { + name: "logs-daemonset", + dataType: component.DataTypeLogs, + service: "test-logs-daemonset", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-daemonset-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, testNs), + "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-daemonset"), + "k8s.daemonset.uid": newExpectedValue(exist, ""), + "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-daemonset"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + }, + }, + } + + for _, tc := range tcs { + t.Run(tc.name, func(t *testing.T) { + switch tc.dataType { + case component.DataTypeTraces: + scanTracesForAttributes(t, tracesConsumer, tc.service, tc.attrs) + case component.DataTypeMetrics: + scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) + case component.DataTypeLogs: + scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) + default: + t.Fatalf("unknown data type %s", tc.dataType) + } + }) + } +} + +// Test with `filter::namespace` set and only role binding to collector's SA. We can't get node and namespace labels/annotations. +func TestE2E_NamespacedRBAC(t *testing.T) { + testDir := filepath.Join("testdata", "e2e", "namespacedrbac") + + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) + require.NoError(t, err) + + nsFile := filepath.Join(testDir, "namespace.yaml") + buf, err := os.ReadFile(nsFile) + require.NoErrorf(t, err, "failed to read namespace object file %s", nsFile) + nsObj, err := k8stest.CreateObject(k8sClient, buf) + require.NoErrorf(t, err, "failed to create k8s namespace from file %s", nsFile) + nsName := nsObj.GetName() + defer func() { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, nsObj), "failed to delete namespace %s", nsName) + }() + + metricsConsumer := new(consumertest.MetricsSink) + tracesConsumer := new(consumertest.TracesSink) + logsConsumer := new(consumertest.LogsSink) + shutdownSinks := startUpSinks(t, metricsConsumer, tracesConsumer, logsConsumer) + defer shutdownSinks() + + testID := uuid.NewString()[:8] + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + createTeleOpts := &k8stest.TelemetrygenCreateOpts{ + ManifestsDir: filepath.Join(testDir, "telemetrygen"), + TestID: testID, + OtlpEndpoint: fmt.Sprintf("otelcol-%s.%s:4317", testID, nsName), + DataTypes: []string{"metrics", "logs", "traces"}, + } + telemetryGenObjs, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, k8sClient, createTeleOpts) + defer func() { + for _, obj := range append(collectorObjs, telemetryGenObjs...) { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) + } + }() + + for _, info := range telemetryGenObjInfos { + k8stest.WaitForTelemetryGenToStart(t, k8sClient, info.Namespace, info.PodLabelSelectors, info.Workload, info.DataType) + } + + wantEntries := 20 // Minimal number of metrics/traces/logs to wait for. + waitForData(t, wantEntries, metricsConsumer, tracesConsumer, logsConsumer) + + tcs := []struct { + name string + dataType component.DataType + service string + attrs map[string]*expectedValue + }{ + { + name: "traces-deployment", + dataType: component.DataTypeTraces, + service: "test-traces-deployment", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*-[a-z0-9]*"), "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, startTimeRe), "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.job.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), - "k8s.job.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "job"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), + "k8s.namespace.name": newExpectedValue(equal, nsName), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), }, }, { - name: "logs-statefulset", - dataType: component.DataTypeLogs, - service: "test-logs-statefulset", + name: "metrics-deployment", + dataType: component.DataTypeMetrics, + service: "test-metrics-deployment", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset-0"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*-[a-z0-9]*"), "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, startTimeRe), "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.statefulset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), - "k8s.statefulset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "statefulset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), + "k8s.namespace.name": newExpectedValue(equal, nsName), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), @@ -328,45 +522,183 @@ func TestE2E(t *testing.T) { attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*-[a-z0-9]*"), "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, startTimeRe), "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), + "k8s.namespace.name": newExpectedValue(equal, nsName), "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), - "k8s.deployment.uid": newExpectedValue(exist, ""), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*"), - "k8s.replicaset.uid": newExpectedValue(exist, ""), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), "k8s.annotations.workload": newExpectedValue(equal, "deployment"), "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), }, }, + } + + for _, tc := range tcs { + t.Run(tc.name, func(t *testing.T) { + switch tc.dataType { + case component.DataTypeTraces: + scanTracesForAttributes(t, tracesConsumer, tc.service, tc.attrs) + case component.DataTypeMetrics: + scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) + case component.DataTypeLogs: + scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) + default: + t.Fatalf("unknown data type %s", tc.dataType) + } + }) + } +} + +// Test with `filter::namespace` set, role binding for namespace-scoped objects (pod, replicaset) and clusterrole +// binding for node and namespace objects. +func TestE2E_MixRBAC(t *testing.T) { + testDir := filepath.Join("testdata", "e2e", "mixrbac") + + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) + require.NoError(t, err) + + metricsConsumer := new(consumertest.MetricsSink) + tracesConsumer := new(consumertest.TracesSink) + logsConsumer := new(consumertest.LogsSink) + shutdownSinks := startUpSinks(t, metricsConsumer, tracesConsumer, logsConsumer) + defer shutdownSinks() + + var workloadNs, otelNs string + testID := uuid.NewString()[:8] + for i, nsManifest := range []string{filepath.Join(testDir, "otelcol-namespace.yaml"), filepath.Join(testDir, "workload-namespace.yaml")} { + buf, err := os.ReadFile(nsManifest) + require.NoErrorf(t, err, "failed to read namespace object file %s", nsManifest) + nsObj, err := k8stest.CreateObject(k8sClient, buf) + require.NoErrorf(t, err, "failed to create k8s namespace from file %s", nsManifest) + switch i { + case 0: + otelNs = nsObj.GetName() + case 1: + workloadNs = nsObj.GetName() + } + + defer func() { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, nsObj), "failed to delete namespace %s", nsObj.GetName()) + }() + } + + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + defer func() { + for _, obj := range collectorObjs { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) + } + }() + + createTeleOpts := &k8stest.TelemetrygenCreateOpts{ + ManifestsDir: filepath.Join(testDir, "telemetrygen"), + TestID: testID, + OtlpEndpoint: fmt.Sprintf("otelcol-%s.%s:4317", testID, otelNs), + DataTypes: []string{"metrics", "logs", "traces"}, + } + + telemetryGenObjs, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, k8sClient, createTeleOpts) + defer func() { + for _, obj := range telemetryGenObjs { + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) + } + }() + + for _, info := range telemetryGenObjInfos { + k8stest.WaitForTelemetryGenToStart(t, k8sClient, info.Namespace, info.PodLabelSelectors, info.Workload, info.DataType) + } + + wantEntries := 20 // Minimal number of metrics/traces/logs to wait for. + waitForData(t, wantEntries, metricsConsumer, tracesConsumer, logsConsumer) + + tcs := []struct { + name string + dataType component.DataType + service string + attrs map[string]*expectedValue + }{ { - name: "logs-daemonset", + name: "traces-deployment", + dataType: component.DataTypeTraces, + service: "test-traces-deployment", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, workloadNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-traces-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + }, + }, + { + name: "metrics-deployment", + dataType: component.DataTypeMetrics, + service: "test-metrics-deployment", + attrs: map[string]*expectedValue{ + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, workloadNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-metrics-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), + }, + }, + { + name: "logs-deployment", dataType: component.DataTypeLogs, - service: "test-logs-daemonset", + service: "test-logs-deployment", attrs: map[string]*expectedValue{ - "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-daemonset-[a-z0-9]*"), - "k8s.pod.ip": newExpectedValue(exist, ""), - "k8s.pod.uid": newExpectedValue(exist, ""), - "k8s.pod.start_time": newExpectedValue(exist, ""), - "k8s.node.name": newExpectedValue(exist, ""), - "k8s.namespace.name": newExpectedValue(equal, "default"), - "k8s.daemonset.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-daemonset"), - "k8s.daemonset.uid": newExpectedValue(exist, ""), - "k8s.annotations.workload": newExpectedValue(equal, "daemonset"), - "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-daemonset"), - "k8s.container.name": newExpectedValue(equal, "telemetrygen"), - "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), - "container.image.tag": newExpectedValue(equal, "latest"), - "container.id": newExpectedValue(exist, ""), - "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*-[a-z0-9]*"), + "k8s.pod.ip": newExpectedValue(exist, ""), + "k8s.pod.uid": newExpectedValue(regex, uidRe), + "k8s.pod.start_time": newExpectedValue(exist, ""), + "k8s.node.name": newExpectedValue(exist, ""), + "k8s.namespace.name": newExpectedValue(equal, workloadNs), + "k8s.deployment.name": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), + "k8s.deployment.uid": newExpectedValue(regex, uidRe), + "k8s.replicaset.name": newExpectedValue(regex, "telemetrygen-"+testID+"-logs-deployment-[a-z0-9]*"), + "k8s.replicaset.uid": newExpectedValue(regex, uidRe), + "k8s.annotations.workload": newExpectedValue(equal, "deployment"), + "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), + "k8s.container.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), + "container.image.tag": newExpectedValue(equal, "latest"), + "container.id": newExpectedValue(exist, ""), + "k8s.namespace.labels.foons": newExpectedValue(equal, "barns"), + "k8s.node.labels.foo": newExpectedValue(equal, "too"), + "k8s.cluster.uid": newExpectedValue(regex, uidRe), }, }, } diff --git a/processor/k8sattributesprocessor/generated_component_test.go b/processor/k8sattributesprocessor/generated_component_test.go index 90bb8bf0b771..9aa28c6101cf 100644 --- a/processor/k8sattributesprocessor/generated_component_test.go +++ b/processor/k8sattributesprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 4fa336f96cbc..27dc6a6f665c 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -9,24 +9,24 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -51,7 +51,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // 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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -83,18 +83,18 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -110,7 +110,7 @@ require ( golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index eafa52df1ad6..c90656520d93 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -38,7 +38,6 @@ cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMz cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= -cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= @@ -211,14 +210,10 @@ cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IK cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= @@ -821,8 +816,6 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -863,8 +856,6 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -954,8 +945,9 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -1237,52 +1229,52 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -2020,8 +2012,8 @@ google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpX google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= 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= @@ -2076,14 +2068,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/processor/k8sattributesprocessor/internal/kube/client.go b/processor/k8sattributesprocessor/internal/kube/client.go index 805820d3ad4a..91d0f4f648b7 100644 --- a/processor/k8sattributesprocessor/internal/kube/client.go +++ b/processor/k8sattributesprocessor/internal/kube/client.go @@ -120,14 +120,17 @@ func New(logger *zap.Logger, apiCfg k8sconfig.APIConfig, rules ExtractionRules, } if newNamespaceInformer == nil { - // if rules to extract metadata from namespace is configured use namespace shared informer containing - // all namespaces including kube-system which contains cluster uid information (kube-system-uid) - if c.extractNamespaceLabelsAnnotations() { + switch { + case c.extractNamespaceLabelsAnnotations(): + // if rules to extract metadata from namespace is configured use namespace shared informer containing + // all namespaces including kube-system which contains cluster uid information (kube-system-uid) newNamespaceInformer = newNamespaceSharedInformer - } else { + case rules.ClusterUID: // use kube-system shared informer to only watch kube-system namespace // reducing overhead of watching all the namespaces newNamespaceInformer = newKubeSystemSharedInformer + default: + newNamespaceInformer = NewNoOpInformer } } @@ -168,7 +171,7 @@ func New(logger *zap.Logger, apiCfg k8sconfig.APIConfig, rules ExtractionRules, } } - if c.extractNodeLabelsAnnotations() { + if c.extractNodeLabelsAnnotations() || c.extractNodeUID() { c.nodeInformer = newNodeSharedInformer(c.kc, c.Filters.Node) } @@ -927,6 +930,10 @@ func (c *WatchClient) extractNodeLabelsAnnotations() bool { return false } +func (c *WatchClient) extractNodeUID() bool { + return c.Rules.NodeUID +} + func (c *WatchClient) addOrUpdateNode(node *api_v1.Node) { newNode := &Node{ Name: node.Name, diff --git a/processor/k8sattributesprocessor/internal/kube/kube.go b/processor/k8sattributesprocessor/internal/kube/kube.go index 47e95e98da33..06d025ca21fa 100644 --- a/processor/k8sattributesprocessor/internal/kube/kube.go +++ b/processor/k8sattributesprocessor/internal/kube/kube.go @@ -210,6 +210,7 @@ type ExtractionRules struct { StatefulSetUID bool StatefulSetName bool Node bool + NodeUID bool StartTime bool ContainerName bool ContainerID bool diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_config.go b/processor/k8sattributesprocessor/internal/metadata/generated_config.go index 28d4bc97a0ce..cda0e14c96ce 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_config.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_config.go @@ -39,6 +39,7 @@ type ResourceAttributesConfig struct { K8sJobUID ResourceAttributeConfig `mapstructure:"k8s.job.uid"` K8sNamespaceName ResourceAttributeConfig `mapstructure:"k8s.namespace.name"` K8sNodeName ResourceAttributeConfig `mapstructure:"k8s.node.name"` + K8sNodeUID ResourceAttributeConfig `mapstructure:"k8s.node.uid"` K8sPodHostname ResourceAttributeConfig `mapstructure:"k8s.pod.hostname"` K8sPodName ResourceAttributeConfig `mapstructure:"k8s.pod.name"` K8sPodStartTime ResourceAttributeConfig `mapstructure:"k8s.pod.start_time"` @@ -93,6 +94,9 @@ func DefaultResourceAttributesConfig() ResourceAttributesConfig { K8sNodeName: ResourceAttributeConfig{ Enabled: true, }, + K8sNodeUID: ResourceAttributeConfig{ + Enabled: false, + }, K8sPodHostname: ResourceAttributeConfig{ Enabled: false, }, diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_config_test.go b/processor/k8sattributesprocessor/internal/metadata/generated_config_test.go index b024a857c8d1..263f271231e9 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_config_test.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_config_test.go @@ -39,6 +39,7 @@ func TestResourceAttributesConfig(t *testing.T) { K8sJobUID: ResourceAttributeConfig{Enabled: true}, K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, K8sNodeName: ResourceAttributeConfig{Enabled: true}, + K8sNodeUID: ResourceAttributeConfig{Enabled: true}, K8sPodHostname: ResourceAttributeConfig{Enabled: true}, K8sPodName: ResourceAttributeConfig{Enabled: true}, K8sPodStartTime: ResourceAttributeConfig{Enabled: true}, @@ -66,6 +67,7 @@ func TestResourceAttributesConfig(t *testing.T) { K8sJobUID: ResourceAttributeConfig{Enabled: false}, K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, K8sNodeName: ResourceAttributeConfig{Enabled: false}, + K8sNodeUID: ResourceAttributeConfig{Enabled: false}, K8sPodHostname: ResourceAttributeConfig{Enabled: false}, K8sPodName: ResourceAttributeConfig{Enabled: false}, K8sPodStartTime: ResourceAttributeConfig{Enabled: false}, diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_resource.go b/processor/k8sattributesprocessor/internal/metadata/generated_resource.go index 2029665c5955..ab0c0746fca4 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_resource.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_resource.go @@ -119,6 +119,13 @@ func (rb *ResourceBuilder) SetK8sNodeName(val string) { } } +// SetK8sNodeUID sets provided value as "k8s.node.uid" attribute. +func (rb *ResourceBuilder) SetK8sNodeUID(val string) { + if rb.config.K8sNodeUID.Enabled { + rb.res.Attributes().PutStr("k8s.node.uid", val) + } +} + // SetK8sPodHostname sets provided value as "k8s.pod.hostname" attribute. func (rb *ResourceBuilder) SetK8sPodHostname(val string) { if rb.config.K8sPodHostname.Enabled { diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_resource_test.go b/processor/k8sattributesprocessor/internal/metadata/generated_resource_test.go index d8ad4098252e..fd96be1e87fe 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_resource_test.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_resource_test.go @@ -27,6 +27,7 @@ func TestResourceBuilder(t *testing.T) { rb.SetK8sJobUID("k8s.job.uid-val") rb.SetK8sNamespaceName("k8s.namespace.name-val") rb.SetK8sNodeName("k8s.node.name-val") + rb.SetK8sNodeUID("k8s.node.uid-val") rb.SetK8sPodHostname("k8s.pod.hostname-val") rb.SetK8sPodName("k8s.pod.name-val") rb.SetK8sPodStartTime("k8s.pod.start_time-val") @@ -43,7 +44,7 @@ func TestResourceBuilder(t *testing.T) { case "default": assert.Equal(t, 8, res.Attributes().Len()) case "all_set": - assert.Equal(t, 22, res.Attributes().Len()) + assert.Equal(t, 23, res.Attributes().Len()) case "none_set": assert.Equal(t, 0, res.Attributes().Len()) return @@ -121,6 +122,11 @@ func TestResourceBuilder(t *testing.T) { if ok { assert.EqualValues(t, "k8s.node.name-val", val.Str()) } + val, ok = res.Attributes().Get("k8s.node.uid") + assert.Equal(t, test == "all_set", ok) + if ok { + assert.EqualValues(t, "k8s.node.uid-val", val.Str()) + } val, ok = res.Attributes().Get("k8s.pod.hostname") assert.Equal(t, test == "all_set", ok) if ok { diff --git a/processor/k8sattributesprocessor/internal/metadata/testdata/config.yaml b/processor/k8sattributesprocessor/internal/metadata/testdata/config.yaml index 55de9c16c27c..d7f95e5bf943 100644 --- a/processor/k8sattributesprocessor/internal/metadata/testdata/config.yaml +++ b/processor/k8sattributesprocessor/internal/metadata/testdata/config.yaml @@ -29,6 +29,8 @@ all_set: enabled: true k8s.node.name: enabled: true + k8s.node.uid: + enabled: true k8s.pod.hostname: enabled: true k8s.pod.name: @@ -75,6 +77,8 @@ none_set: enabled: false k8s.node.name: enabled: false + k8s.node.uid: + enabled: false k8s.pod.hostname: enabled: false k8s.pod.name: diff --git a/processor/k8sattributesprocessor/metadata.yaml b/processor/k8sattributesprocessor/metadata.yaml index aa481f9c4f65..9ae10a711572 100644 --- a/processor/k8sattributesprocessor/metadata.yaml +++ b/processor/k8sattributesprocessor/metadata.yaml @@ -86,6 +86,10 @@ resource_attributes: description: The name of the Node. type: string enabled: true + k8s.node.uid: + description: The UID of the Node. + type: string + enabled: false container.id: description: Container ID. Usually a UUID, as for example used to identify Docker containers. The UUID might be abbreviated. Requires k8s.container.restart_count. type: string diff --git a/processor/k8sattributesprocessor/options.go b/processor/k8sattributesprocessor/options.go index ab4b4695ab39..033d3bb303c0 100644 --- a/processor/k8sattributesprocessor/options.go +++ b/processor/k8sattributesprocessor/options.go @@ -94,6 +94,9 @@ func enabledAttributes() (attributes []string) { if defaultConfig.K8sNodeName.Enabled { attributes = append(attributes, conventions.AttributeK8SNodeName) } + if defaultConfig.K8sNodeUID.Enabled { + attributes = append(attributes, conventions.AttributeK8SNodeUID) + } if defaultConfig.K8sPodHostname.Enabled { attributes = append(attributes, specPodHostName) } @@ -163,6 +166,8 @@ func withExtractMetadata(fields ...string) option { p.rules.CronJobName = true case conventions.AttributeK8SNodeName: p.rules.Node = true + case conventions.AttributeK8SNodeUID: + p.rules.NodeUID = true case conventions.AttributeContainerID: p.rules.ContainerID = true case conventions.AttributeContainerImageName: diff --git a/processor/k8sattributesprocessor/processor.go b/processor/k8sattributesprocessor/processor.go index 136d224e0a8b..b2c4e82490f0 100644 --- a/processor/k8sattributesprocessor/processor.go +++ b/processor/k8sattributesprocessor/processor.go @@ -166,6 +166,12 @@ func (kp *kubernetesprocessor) processResource(ctx context.Context, resource pco resource.Attributes().PutStr(key, val) } } + nodeUID := kp.getUIDForPodsNode(nodeName) + if nodeUID != "" { + if _, found := resource.Attributes().Get(conventions.AttributeK8SNodeUID); !found { + resource.Attributes().PutStr(conventions.AttributeK8SNodeUID, nodeUID) + } + } } } @@ -263,6 +269,14 @@ func (kp *kubernetesprocessor) getAttributesForPodsNode(nodeName string) map[str return node.Attributes } +func (kp *kubernetesprocessor) getUIDForPodsNode(nodeName string) string { + node, ok := kp.kc.GetNode(nodeName) + if !ok { + return "" + } + return node.NodeUID +} + // intFromAttribute extracts int value from an attribute stored as string or int func intFromAttribute(val pcommon.Value) (int, error) { switch val.Type() { diff --git a/processor/k8sattributesprocessor/processor_test.go b/processor/k8sattributesprocessor/processor_test.go index 94d6ee91d7fd..d22de00d7259 100644 --- a/processor/k8sattributesprocessor/processor_test.go +++ b/processor/k8sattributesprocessor/processor_test.go @@ -880,6 +880,72 @@ func TestAddNodeLabels(t *testing.T) { }) } +func TestAddNodeUID(t *testing.T) { + nodeUID := "asdfasdf-asdfasdf-asdf" + m := newMultiTest( + t, + func() component.Config { + cfg := createDefaultConfig().(*Config) + cfg.Extract.Metadata = []string{"k8s.node.uid"} + cfg.Extract.Labels = []FieldExtractConfig{} + return cfg + }(), + nil, + ) + + podIP := "1.1.1.1" + nodes := map[string]map[string]string{ + "node-1": { + "nodelabel": "1", + }, + } + m.kubernetesProcessorOperation(func(kp *kubernetesprocessor) { + kp.podAssociations = []kube.Association{ + { + Sources: []kube.AssociationSource{ + { + From: "connection", + }, + }, + }, + } + }) + + m.kubernetesProcessorOperation(func(kp *kubernetesprocessor) { + pi := kube.PodIdentifier{ + kube.PodIdentifierAttributeFromConnection(podIP), + } + kp.kc.(*fakeClient).Pods[pi] = &kube.Pod{Name: "test-2323", NodeName: "node-1"} + kp.kc.(*fakeClient).Nodes = make(map[string]*kube.Node) + for ns, labels := range nodes { + kp.kc.(*fakeClient).Nodes[ns] = &kube.Node{Attributes: labels, NodeUID: nodeUID} + } + }) + + ctx := client.NewContext(context.Background(), client.Info{ + Addr: &net.IPAddr{ + IP: net.ParseIP(podIP), + }, + }) + m.testConsume( + ctx, + generateTraces(), + generateMetrics(), + generateLogs(), + func(err error) { + assert.NoError(t, err) + }) + + m.assertBatchesLen(1) + m.assertResourceObjectLen(0) + m.assertResource(0, func(res pcommon.Resource) { + assert.Equal(t, 3, res.Attributes().Len()) + assertResourceHasStringAttribute(t, res, "k8s.pod.ip", podIP) + assertResourceHasStringAttribute(t, res, "k8s.node.uid", nodeUID) + assertResourceHasStringAttribute(t, res, "nodelabel", "1") + }) +} + func TestProcessorAddContainerAttributes(t *testing.T) { tests := []struct { name string diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrole.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrole.yaml new file mode 100644 index 000000000000..e93e29729996 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrole.yaml @@ -0,0 +1,14 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Name }} +rules: + - apiGroups: [""] + resources: ["pods", "nodes"] + verbs: ["get", "watch", "list"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "watch", "list"] + - apiGroups: [ "" ] + resources: ["namespaces"] + verbs: [ "get", "watch", "list" ] diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrolebinding.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrolebinding.yaml new file mode 100644 index 000000000000..41b16aef0ead --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/clusterrolebinding.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Name }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ .Name }} +subjects: + - kind: ServiceAccount + name: {{ .Name }} + namespace: e2ek8sattribute-clusterrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/configmap.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/configmap.yaml similarity index 95% rename from processor/k8sattributesprocessor/testdata/e2e/collector/configmap.yaml rename to processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/configmap.yaml index e82cead3fdec..384903a4b1fd 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/configmap.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Name }}-config - namespace: default + namespace: e2ek8sattribute-clusterrbac data: relay: | exporters: @@ -25,6 +25,8 @@ data: tag_name: k8s.labels.app - from: node key: foo + - from: namespace + key: foons metadata: - k8s.pod.name - k8s.pod.start_time diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/deployment.yaml new file mode 100644 index 000000000000..a2011605a3e0 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/deployment.yaml @@ -0,0 +1,59 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-clusterrbac +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} + template: + metadata: + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} + spec: + serviceAccountName: {{ .Name }} + containers: + - name: opentelemetry-collector + command: + - /otelcontribcol + - --config=/conf/relay.yaml + image: "otelcontribcol:latest" + imagePullPolicy: Never + ports: + - name: otlp + containerPort: 4317 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + livenessProbe: + httpGet: + path: / + port: 13133 + initialDelaySeconds: 3 + readinessProbe: + httpGet: + path: / + port: 13133 + initialDelaySeconds: 3 + resources: + limits: + cpu: 128m + memory: 256Mi + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: {{ .Name }}-config + items: + - key: relay + path: relay.yaml diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/service.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/service.yaml new file mode 100644 index 000000000000..2f4ae9540089 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-clusterrbac +spec: + type: ClusterIP + ports: + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/serviceaccount.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/serviceaccount.yaml new file mode 100644 index 000000000000..21cde70461ce --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/collector/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-clusterrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/namespace.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/namespace.yaml new file mode 100644 index 000000000000..c5161a2e8dc3 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: e2ek8sattribute-clusterrbac + labels: + foons: barns diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/daemonset.yaml similarity index 95% rename from processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml rename to processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/daemonset.yaml index 9d8effb27124..4ac9fecf815e 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/daemonset.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ .Name }}-{{ .DataType }}-daemonset - namespace: default + namespace: e2ek8sattribute-clusterrbac spec: selector: matchLabels: diff --git a/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/deployment.yaml new file mode 100644 index 000000000000..8344d9b8ad90 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/deployment.yaml @@ -0,0 +1,34 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Name }}-{{ .DataType }}-deployment + namespace: e2ek8sattribute-clusterrbac +spec: + replicas: 1 + selector: + matchLabels: + app: {{ .Name }}-{{ .DataType }}-deployment + template: + metadata: + annotations: + workload: deployment + labels: + app: {{ .Name }}-{{ .DataType }}-deployment + spec: + containers: + - command: + - /telemetrygen + - {{ .DataType }} + - --otlp-insecure + - --otlp-endpoint={{ .OTLPEndpoint }} + - --duration=36000s + - --rate=1 + - --otlp-attributes=service.name="test-{{ .DataType }}-deployment" + - --otlp-attributes=k8s.container.name="telemetrygen" +{{- if eq .DataType "traces" }} + - --status-code= +{{- end }} + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest + imagePullPolicy: IfNotPresent + name: telemetrygen + restartPolicy: Always diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/job.yaml similarity index 94% rename from processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml rename to processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/job.yaml index dd0e9dcdf345..76a003ea9533 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/job.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ .Name }}-{{ .DataType}}-job - namespace: default + namespace: e2ek8sattribute-clusterrbac spec: template: metadata: diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/statefulset.yaml similarity index 95% rename from processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml rename to processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/statefulset.yaml index 6dcb9a2739ae..4ef983a8a3ef 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/clusterrbac/telemetrygen/statefulset.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ .Name }}-{{ .DataType }}-statefulset - namespace: default + namespace: e2ek8sattribute-clusterrbac spec: serviceName: {{ .Name }}-{{ .DataType }}-statefulset replicas: 1 diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrole.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrole.yaml new file mode 100644 index 000000000000..536113c9c1a8 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrole.yaml @@ -0,0 +1,11 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Name }} +rules: + - apiGroups: [ "" ] + resources: ["namespaces"] + verbs: [ "list", "get", "watch" ] + - apiGroups: [ "" ] + resources: ["nodes"] + verbs: [ "get", "watch", "list" ] diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/clusterrolebinding.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrolebinding.yaml similarity index 86% rename from processor/k8sattributesprocessor/testdata/e2e/collector/clusterrolebinding.yaml rename to processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrolebinding.yaml index b792cc6309de..1f06e35fc54e 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/clusterrolebinding.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/clusterrolebinding.yaml @@ -9,4 +9,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ .Name }} - namespace: default + namespace: e2ek8sattribute-mixrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/configmap.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/configmap.yaml new file mode 100644 index 000000000000..33a368cf7bec --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/configmap.yaml @@ -0,0 +1,78 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Name }}-config + namespace: e2ek8sattribute-mixrbac +data: + relay: | + exporters: + otlp: + endpoint: {{ .HostEndpoint }}:4317 + tls: + insecure: true + extensions: + health_check: {} + processors: + k8sattributes: + filter: + namespace: e2ek8sattribute-workloadns + extract: + annotations: + - from: pod + key: workload + tag_name: k8s.annotations.workload + labels: + - from: pod + key: app + tag_name: k8s.labels.app + - from: node + key: foo + - from: namespace + key: foons + metadata: + - k8s.pod.name + - k8s.pod.start_time + - k8s.pod.uid + - k8s.namespace.name + - k8s.deployment.name + - k8s.deployment.uid + - k8s.replicaset.name + - k8s.replicaset.uid + - k8s.node.name + - container.id + - container.image.name + - container.image.tag + - k8s.cluster.uid + pod_association: + - sources: + - from: connection + receivers: + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + service: + extensions: + - health_check + pipelines: + metrics: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp + traces: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp + logs: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/deployment.yaml similarity index 97% rename from processor/k8sattributesprocessor/testdata/e2e/collector/deployment.yaml rename to processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/deployment.yaml index 841c472b04f4..14860e9513fd 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/deployment.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Name }} - namespace: default + namespace: e2ek8sattribute-mixrbac spec: replicas: 1 selector: diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/role-workloadns.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/role-workloadns.yaml new file mode 100644 index 000000000000..70a16a2de0d5 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/role-workloadns.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: otelcol-workloadns + namespace: e2ek8sattribute-workloadns +rules: + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "watch", "list"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "watch", "list"] diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/rolebinding-workloadns.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/rolebinding-workloadns.yaml new file mode 100644 index 000000000000..3ece0171afdd --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/rolebinding-workloadns.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: otelcol-workloadns + namespace: e2ek8sattribute-workloadns +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: otelcol-workloadns +subjects: + - kind: ServiceAccount + name: otelcol-{{ .TestID }} + namespace: e2ek8sattribute-mixrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/service.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/service.yaml similarity index 89% rename from processor/k8sattributesprocessor/testdata/e2e/collector/service.yaml rename to processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/service.yaml index 1bbfffb99197..fe014682fb8a 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/service.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Name }} - namespace: default + namespace: e2ek8sattribute-mixrbac spec: type: ClusterIP ports: diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/serviceaccount.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/serviceaccount.yaml similarity index 64% rename from processor/k8sattributesprocessor/testdata/e2e/collector/serviceaccount.yaml rename to processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/serviceaccount.yaml index bdb3a8dd1b8f..e688469a9e49 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/serviceaccount.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/collector/serviceaccount.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ .Name }} - namespace: default + namespace: e2ek8sattribute-mixrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/otelcol-namespace.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/otelcol-namespace.yaml new file mode 100644 index 000000000000..a43f6cae18d9 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/otelcol-namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: e2ek8sattribute-mixrbac + labels: + foons: barns diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/telemetrygen/deployment.yaml similarity index 95% rename from processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml rename to processor/k8sattributesprocessor/testdata/e2e/mixrbac/telemetrygen/deployment.yaml index bc31edac33ed..a09257347f5e 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/telemetrygen/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Name }}-{{ .DataType }}-deployment - namespace: default + namespace: e2ek8sattribute-workloadns spec: replicas: 1 selector: diff --git a/processor/k8sattributesprocessor/testdata/e2e/mixrbac/workload-namespace.yaml b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/workload-namespace.yaml new file mode 100644 index 000000000000..4cf0a4a67531 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/mixrbac/workload-namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: e2ek8sattribute-workloadns + labels: + foons: barns diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/configmap.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/configmap.yaml new file mode 100644 index 000000000000..e8170c327bf5 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/configmap.yaml @@ -0,0 +1,82 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Name }}-config + namespace: e2ek8sattribute-namespacedrbac +data: + relay: | + exporters: + otlp: + endpoint: {{ .HostEndpoint }}:4317 + tls: + insecure: true + extensions: + health_check: {} + processors: + k8sattributes: + filter: + namespace: e2ek8sattribute-namespacedrbac + node_from_env_var: MY_NODE_NAME + labels: + - key: component + value: telemetrygen + op: equals + fields: + - key: spec.restartPolicy + value: Never + op: not-equals + extract: + annotations: + - from: pod + key: workload + tag_name: k8s.annotations.workload + labels: + - from: pod + key: app + tag_name: k8s.labels.app + metadata: + - k8s.pod.name + - k8s.pod.start_time + - k8s.pod.uid + - k8s.namespace.name + - k8s.deployment.name + - k8s.deployment.uid + - k8s.replicaset.name + - k8s.replicaset.uid + - k8s.node.name + - container.id + - container.image.name + - container.image.tag + pod_association: + - sources: + - from: connection + receivers: + otlp: + protocols: + grpc: + endpoint: ${env:MY_POD_IP}:4317 + service: + extensions: + - health_check + pipelines: + metrics: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp + traces: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp + logs: + exporters: + - otlp + processors: + - k8sattributes + receivers: + - otlp diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/deployment.yaml new file mode 100644 index 000000000000..c4c54829bf68 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/deployment.yaml @@ -0,0 +1,65 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} + template: + metadata: + labels: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} + spec: + serviceAccountName: {{ .Name }} + containers: + - name: opentelemetry-collector + command: + - /otelcontribcol + - --config=/conf/relay.yaml + - --feature-gates=k8sattr.rfc3339 + image: "otelcontribcol:latest" + imagePullPolicy: Never + ports: + - name: otlp + containerPort: 4317 + protocol: TCP + env: + - name: MY_POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP + - name: MY_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + livenessProbe: + httpGet: + path: / + port: 13133 + initialDelaySeconds: 3 + readinessProbe: + httpGet: + path: / + port: 13133 + initialDelaySeconds: 3 + resources: + limits: + cpu: 128m + memory: 256Mi + volumeMounts: + - mountPath: /conf + name: opentelemetry-collector-configmap + volumes: + - name: opentelemetry-collector-configmap + configMap: + name: {{ .Name }}-config + items: + - key: relay + path: relay.yaml diff --git a/processor/k8sattributesprocessor/testdata/e2e/collector/clusterrole.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/role.yaml similarity index 74% rename from processor/k8sattributesprocessor/testdata/e2e/collector/clusterrole.yaml rename to processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/role.yaml index 5bc4bfb348ab..336174eda79b 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/collector/clusterrole.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/role.yaml @@ -1,10 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole +kind: Role metadata: name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac rules: - apiGroups: [""] - resources: ["pods", "namespaces", "nodes"] + resources: ["pods"] verbs: ["get", "watch", "list"] - apiGroups: ["apps"] resources: ["replicasets"] diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/rolebinding.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/rolebinding.yaml new file mode 100644 index 000000000000..fd39c71386ea --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/rolebinding.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ .Name }} +subjects: + - kind: ServiceAccount + name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/service.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/service.yaml new file mode 100644 index 000000000000..9e83585a9058 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac +spec: + type: ClusterIP + ports: + - name: otlp + port: 4317 + targetPort: 4317 + protocol: TCP + appProtocol: grpc + selector: + app.kubernetes.io/name: opentelemetry-collector + app.kubernetes.io/instance: {{ .Name }} diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/serviceaccount.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/serviceaccount.yaml new file mode 100644 index 000000000000..8e707e5f3ff6 --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/collector/serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Name }} + namespace: e2ek8sattribute-namespacedrbac diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/namespace.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/namespace.yaml new file mode 100644 index 000000000000..baaecf01583a --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: e2ek8sattribute-namespacedrbac + labels: + foons: barns diff --git a/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/telemetrygen/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/telemetrygen/deployment.yaml new file mode 100644 index 000000000000..fd56c39d4eff --- /dev/null +++ b/processor/k8sattributesprocessor/testdata/e2e/namespacedrbac/telemetrygen/deployment.yaml @@ -0,0 +1,35 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Name }}-{{ .DataType }}-deployment + namespace: e2ek8sattribute-namespacedrbac +spec: + replicas: 1 + selector: + matchLabels: + app: {{ .Name }}-{{ .DataType }}-deployment + template: + metadata: + annotations: + workload: deployment + labels: + app: {{ .Name }}-{{ .DataType }}-deployment + component: telemetrygen + spec: + containers: + - command: + - /telemetrygen + - {{ .DataType }} + - --otlp-insecure + - --otlp-endpoint={{ .OTLPEndpoint }} + - --duration=36000s + - --rate=1 + - --otlp-attributes=service.name="test-{{ .DataType }}-deployment" + - --otlp-attributes=k8s.container.name="telemetrygen" +{{- if eq .DataType "traces" }} + - --status-code= +{{- end }} + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest + imagePullPolicy: IfNotPresent + name: telemetrygen + restartPolicy: Always diff --git a/processor/logstransformprocessor/generated_component_test.go b/processor/logstransformprocessor/generated_component_test.go index af4b38e3f40e..cfa49c4d827e 100644 --- a/processor/logstransformprocessor/generated_component_test.go +++ b/processor/logstransformprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 36bd467b6cd3..5443fff0df51 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -48,10 +49,10 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -60,9 +61,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 466ca40b0abf..41ad92bc4e6e 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,26 +81,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,12 +166,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/metricsgenerationprocessor/generated_component_test.go b/processor/metricsgenerationprocessor/generated_component_test.go index bfea4e7ea1e5..39b2fc951be0 100644 --- a/processor/metricsgenerationprocessor/generated_component_test.go +++ b/processor/metricsgenerationprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index caa331ff411e..0a2144f7b856 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -48,7 +49,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/metricstransformprocessor/generated_component_test.go b/processor/metricstransformprocessor/generated_component_test.go index 71fabc61ad2d..534d0c11d2c5 100644 --- a/processor/metricstransformprocessor/generated_component_test.go +++ b/processor/metricstransformprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 05fbc1f4047f..9a0312a6453c 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -51,7 +52,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/probabilisticsamplerprocessor/fnvhasher.go b/processor/probabilisticsamplerprocessor/fnvhasher.go index c12d803f2975..d0fd366f1d26 100644 --- a/processor/probabilisticsamplerprocessor/fnvhasher.go +++ b/processor/probabilisticsamplerprocessor/fnvhasher.go @@ -4,6 +4,7 @@ package probabilisticsamplerprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" import ( + "encoding/binary" "hash/fnv" ) @@ -19,8 +20,6 @@ func computeHash(b []byte, seed uint32) uint32 { // i32tob converts a seed to a byte array to be used as part of fnv.Write() func i32tob(val uint32) []byte { r := make([]byte, 4) - for i := uint32(0); i < 4; i++ { - r[i] = byte((val >> (8 * i)) & 0xff) - } + binary.LittleEndian.PutUint32(r, val) return r } diff --git a/processor/probabilisticsamplerprocessor/fnvhasher_test.go b/processor/probabilisticsamplerprocessor/fnvhasher_test.go new file mode 100644 index 000000000000..5f69d3fcb0e0 --- /dev/null +++ b/processor/probabilisticsamplerprocessor/fnvhasher_test.go @@ -0,0 +1,16 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package probabilisticsamplerprocessor + +import ( + "testing" +) + +func BenchmarkSeedConversion(b *testing.B) { + val := uint32(0x3024001) // Just a random 32 bit int + b.ResetTimer() + for i := 0; i < b.N; i++ { + i32tob(val) + } +} diff --git a/processor/probabilisticsamplerprocessor/generated_component_test.go b/processor/probabilisticsamplerprocessor/generated_component_test.go index fe172fcee1c5..3000a9b11cee 100644 --- a/processor/probabilisticsamplerprocessor/generated_component_test.go +++ b/processor/probabilisticsamplerprocessor/generated_component_test.go @@ -64,20 +64,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 370c52fc4e21..1e744d247bb9 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.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -51,26 +51,26 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -93,7 +93,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index fb0756f550bc..6e0a2a346c83 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -107,8 +107,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -133,58 +133,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -263,7 +263,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -300,8 +300,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/processor/redactionprocessor/generated_component_test.go b/processor/redactionprocessor/generated_component_test.go index 11fd2369352c..627d42328c05 100644 --- a/processor/redactionprocessor/generated_component_test.go +++ b/processor/redactionprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 371fb2522325..32b49abe04ff 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -24,6 +24,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -37,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -48,7 +49,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index 75d99e387873..4619275d827a 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/remotetapprocessor/generated_component_test.go b/processor/remotetapprocessor/generated_component_test.go index bc3c329746b7..513272854940 100644 --- a/processor/remotetapprocessor/generated_component_test.go +++ b/processor/remotetapprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/remotetapprocessor/go.mod b/processor/remotetapprocessor/go.mod index d60246936403..b05a0a25af66 100644 --- a/processor/remotetapprocessor/go.mod +++ b/processor/remotetapprocessor/go.mod @@ -6,12 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -31,6 +31,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -47,16 +48,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -66,7 +67,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/remotetapprocessor/go.sum b/processor/remotetapprocessor/go.sum index d0a034097b96..acfc404fea95 100644 --- a/processor/remotetapprocessor/go.sum +++ b/processor/remotetapprocessor/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 829e3f6accf9..20ba6b7e7c6d 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { openshiftConfig.OpenShiftConfig = openshift.Config{ Address: "127.0.0.1:4444", Token: "some_token", - TLSSettings: configtls.TLSClientSetting{ + TLSSettings: configtls.ClientConfig{ Insecure: true, }, ResourceAttributes: openshift.CreateDefaultConfig().ResourceAttributes, diff --git a/processor/resourcedetectionprocessor/generated_component_test.go b/processor/resourcedetectionprocessor/generated_component_test.go index 197358575f43..915630ecbfb9 100644 --- a/processor/resourcedetectionprocessor/generated_component_test.go +++ b/processor/resourcedetectionprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 37b707d3407f..37e8693eaece 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -14,23 +14,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -57,7 +57,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -110,13 +110,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.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -133,12 +133,12 @@ require ( golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index f6cb698f69a3..6a238b1e3108 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -172,8 +172,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -466,40 +466,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -778,8 +778,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -825,14 +825,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/processor/resourcedetectionprocessor/internal/openshift/config.go b/processor/resourcedetectionprocessor/internal/openshift/config.go index 57e9a0c56b53..408bcc760984 100644 --- a/processor/resourcedetectionprocessor/internal/openshift/config.go +++ b/processor/resourcedetectionprocessor/internal/openshift/config.go @@ -48,7 +48,7 @@ type Config struct { // TLSSettings contains TLS configurations that are specific to client // connection used to communicate with the Openshift API. - TLSSettings configtls.TLSClientSetting `mapstructure:"tls"` + TLSSettings configtls.ClientConfig `mapstructure:"tls"` ResourceAttributes metadata.ResourceAttributesConfig `mapstructure:"resource_attributes"` } diff --git a/processor/resourceprocessor/generated_component_test.go b/processor/resourceprocessor/generated_component_test.go index 8f6f2aa60949..5c851b559f99 100644 --- a/processor/resourceprocessor/generated_component_test.go +++ b/processor/resourceprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 65ebae3f829c..37d8cdf52c37 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -53,7 +54,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 6d59ebd28d15..8d35949eb5e5 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -64,22 +66,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -131,8 +133,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/routingprocessor/generated_component_test.go b/processor/routingprocessor/generated_component_test.go index 88328c94844d..6b0a469d4a2d 100644 --- a/processor/routingprocessor/generated_component_test.go +++ b/processor/routingprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 8dd30a4980ff..3fce2f3b5874 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,22 +5,22 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -56,19 +56,19 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index a6cc084fca44..1185d15de0d9 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0= github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6icjJvbsmV8= @@ -14,13 +10,9 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -98,52 +90,52 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= @@ -185,8 +177,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -207,15 +197,13 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/schemaprocessor/generated_component_test.go b/processor/schemaprocessor/generated_component_test.go index fe8b6cbf66af..0b78d571418c 100644 --- a/processor/schemaprocessor/generated_component_test.go +++ b/processor/schemaprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 73c42d1650a7..6d0f221b76d0 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/schema v0.0.7 go.opentelemetry.io/otel/trace v1.24.0 @@ -30,6 +30,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -46,16 +47,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -65,7 +66,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 31da65e9d6be..2218336e714b 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/spanprocessor/generated_component_test.go b/processor/spanprocessor/generated_component_test.go index 9da09da9c53d..beaf819ccef9 100644 --- a/processor/spanprocessor/generated_component_test.go +++ b/processor/spanprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 1a9d1678f8d1..9f2e823714e9 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,9 +48,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -62,7 +62,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 5efcfe41671a..d043ec18b7a3 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -80,24 +80,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -151,8 +151,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/sumologicprocessor/generated_component_test.go b/processor/sumologicprocessor/generated_component_test.go index b5c597d28d04..71ffdc0d85f4 100644 --- a/processor/sumologicprocessor/generated_component_test.go +++ b/processor/sumologicprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/sumologicprocessor/go.mod b/processor/sumologicprocessor/go.mod index 7edf6efd1961..3631ff9bd90f 100644 --- a/processor/sumologicprocessor/go.mod +++ b/processor/sumologicprocessor/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -48,28 +48,28 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -93,7 +93,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/sumologicprocessor/go.sum b/processor/sumologicprocessor/go.sum index 40f3cd9eec56..5bfc6c9a841d 100644 --- a/processor/sumologicprocessor/go.sum +++ b/processor/sumologicprocessor/go.sum @@ -109,8 +109,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -135,58 +135,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -265,7 +265,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -302,8 +302,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/processor/tailsamplingprocessor/generated_component_test.go b/processor/tailsamplingprocessor/generated_component_test.go index 6381259b3ffd..fb5f89f0b1ea 100644 --- a/processor/tailsamplingprocessor/generated_component_test.go +++ b/processor/tailsamplingprocessor/generated_component_test.go @@ -57,20 +57,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 6947ed2b7522..5e5860a9663b 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -50,7 +50,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,7 +61,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index f9d6241e98bc..03d33ece9061 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -118,22 +118,22 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -214,8 +214,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/processor/tailsamplingprocessor/processor.go b/processor/tailsamplingprocessor/processor.go index 9ffcb13846e0..979c790839e3 100644 --- a/processor/tailsamplingprocessor/processor.go +++ b/processor/tailsamplingprocessor/processor.go @@ -77,10 +77,6 @@ const ( // newTracesProcessor returns a processor.TracesProcessor that will perform tail sampling according to the given // configuration. func newTracesProcessor(ctx context.Context, settings component.TelemetrySettings, nextConsumer consumer.Traces, cfg Config) (processor.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - policyNames := map[string]bool{} policies := make([]*policy, len(cfg.PolicyCfgs)) for i := range cfg.PolicyCfgs { diff --git a/processor/transformprocessor/generated_component_test.go b/processor/transformprocessor/generated_component_test.go index 3a39289897ef..368d432fbd87 100644 --- a/processor/transformprocessor/generated_component_test.go +++ b/processor/transformprocessor/generated_component_test.go @@ -71,20 +71,26 @@ func TestComponentLifecycle(t *testing.T) { err = c.Start(context.Background(), host) require.NoError(t, err) require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: + switch test.name { + case "logs": + e, ok := c.(processor.Logs) + require.True(t, ok) logs := generateLifecycleTestLogs() if !e.Capabilities().MutatesData { logs.MarkReadOnly() } err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: + case "metrics": + e, ok := c.(processor.Metrics) + require.True(t, ok) metrics := generateLifecycleTestMetrics() if !e.Capabilities().MutatesData { metrics.MarkReadOnly() } err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: + case "traces": + e, ok := c.(processor.Traces) + require.True(t, ok) traces := generateLifecycleTestTraces() if !e.Capabilities().MutatesData { traces.MarkReadOnly() diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index c8b6cc0dcb5e..a7431c7e4ae2 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -60,7 +60,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 3d66ac007c11..bb16869a4417 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -78,22 +78,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -147,8 +147,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/processor/transformprocessor/internal/metrics/func_extract_count_metric.go b/processor/transformprocessor/internal/metrics/func_extract_count_metric.go index 789a6226beba..49c218f28c1a 100644 --- a/processor/transformprocessor/internal/metrics/func_extract_count_metric.go +++ b/processor/transformprocessor/internal/metrics/func_extract_count_metric.go @@ -44,7 +44,8 @@ func extractCountMetric(monotonic bool) (ottl.ExprFunc[ottlmetric.TransformConte countMetric := pmetric.NewMetric() countMetric.SetDescription(metric.Description()) countMetric.SetName(metric.Name() + "_count") - countMetric.SetUnit(metric.Unit()) + // Use the default unit as the original metric unit does not apply to the 'count' field + countMetric.SetUnit("1") countMetric.SetEmptySum().SetAggregationTemporality(aggTemp) countMetric.Sum().SetIsMonotonic(monotonic) diff --git a/processor/transformprocessor/internal/metrics/func_extract_count_metric_test.go b/processor/transformprocessor/internal/metrics/func_extract_count_metric_test.go index e1108fa20394..cf3c22d121f4 100644 --- a/processor/transformprocessor/internal/metrics/func_extract_count_metric_test.go +++ b/processor/transformprocessor/internal/metrics/func_extract_count_metric_test.go @@ -24,6 +24,7 @@ func Test_extractCountMetric(t *testing.T) { histogramMetric := getTestHistogramMetric() histogramMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() + countMetric.SetUnit("1") countMetric.SetEmptySum() countMetric.Sum().SetAggregationTemporality(histogramMetric.Histogram().AggregationTemporality()) countMetric.Sum().SetIsMonotonic(false) @@ -44,6 +45,7 @@ func Test_extractCountMetric(t *testing.T) { histogramMetric := getTestHistogramMetric() histogramMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() + countMetric.SetUnit("1") countMetric.SetEmptySum() countMetric.Sum().SetAggregationTemporality(histogramMetric.Histogram().AggregationTemporality()) countMetric.Sum().SetIsMonotonic(true) @@ -64,6 +66,7 @@ func Test_extractCountMetric(t *testing.T) { expHistogramMetric := getTestExponentialHistogramMetric() expHistogramMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() + countMetric.SetUnit("1") countMetric.SetEmptySum() countMetric.Sum().SetAggregationTemporality(expHistogramMetric.ExponentialHistogram().AggregationTemporality()) countMetric.Sum().SetIsMonotonic(false) @@ -85,6 +88,7 @@ func Test_extractCountMetric(t *testing.T) { expHistogramMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() countMetric.SetEmptySum() + countMetric.SetUnit("1") countMetric.Sum().SetAggregationTemporality(expHistogramMetric.ExponentialHistogram().AggregationTemporality()) countMetric.Sum().SetIsMonotonic(true) @@ -105,6 +109,7 @@ func Test_extractCountMetric(t *testing.T) { summaryMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() countMetric.SetEmptySum() + countMetric.SetUnit("1") countMetric.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) countMetric.Sum().SetIsMonotonic(false) @@ -125,6 +130,7 @@ func Test_extractCountMetric(t *testing.T) { summaryMetric.CopyTo(metrics.AppendEmpty()) countMetric := metrics.AppendEmpty() countMetric.SetEmptySum() + countMetric.SetUnit("1") countMetric.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) countMetric.Sum().SetIsMonotonic(true) diff --git a/processor/transformprocessor/internal/metrics/processor_test.go b/processor/transformprocessor/internal/metrics/processor_test.go index 9edd4f0af691..912b69ed99f4 100644 --- a/processor/transformprocessor/internal/metrics/processor_test.go +++ b/processor/transformprocessor/internal/metrics/processor_test.go @@ -163,7 +163,7 @@ func Test_ProcessMetrics_MetricContext(t *testing.T) { countMetric.SetName(histogramMetric.Name() + "_count") countMetric.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) countMetric.Sum().SetIsMonotonic(true) - countMetric.SetUnit(histogramMetric.Unit()) + countMetric.SetUnit("1") histogramDp0 := histogramMetric.Histogram().DataPoints().At(0) countDp0 := countMetric.Sum().DataPoints().AppendEmpty() diff --git a/receiver/activedirectorydsreceiver/config.go b/receiver/activedirectorydsreceiver/config.go index 3dd4a6f586bb..929d2168ff88 100644 --- a/receiver/activedirectorydsreceiver/config.go +++ b/receiver/activedirectorydsreceiver/config.go @@ -10,6 +10,6 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 3f615a41cd2a..64d89d264c72 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index eb339448b677..7bcaa740b11e 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -26,10 +26,10 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index a5e482a9b5e4..bc9f77f9622d 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -43,7 +43,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &c.ScraperControllerSettings, + &c.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 184b4c143ec0..f5a3d1eeb9f4 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -53,7 +54,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index a72d6adb5dc2..ae323ea7283f 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/aerospikereceiver/config.go b/receiver/aerospikereceiver/config.go index 1e8040226f2b..3ebed5363b84 100644 --- a/receiver/aerospikereceiver/config.go +++ b/receiver/aerospikereceiver/config.go @@ -31,15 +31,15 @@ var ( // Config is the receiver configuration type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Endpoint string `mapstructure:"endpoint"` - TLSName string `mapstructure:"tlsname"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - CollectClusterMetrics bool `mapstructure:"collect_cluster_metrics"` - Timeout time.Duration `mapstructure:"timeout"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - TLS *configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Endpoint string `mapstructure:"endpoint"` + TLSName string `mapstructure:"tlsname"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + CollectClusterMetrics bool `mapstructure:"collect_cluster_metrics"` + Timeout time.Duration `mapstructure:"timeout"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + TLS *configtls.ClientConfig `mapstructure:"tls,omitempty"` } // Validate validates the values of the given Config, and returns an error if validation fails diff --git a/receiver/aerospikereceiver/config_test.go b/receiver/aerospikereceiver/config_test.go index 9df9bdb4262b..1a3e3c0e434d 100644 --- a/receiver/aerospikereceiver/config_test.go +++ b/receiver/aerospikereceiver/config_test.go @@ -26,76 +26,76 @@ func TestValidate(t *testing.T) { { name: "blank endpoint", config: &Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpoint, }, { name: "missing port", config: &Config{ - Endpoint: "localhost", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "bad endpoint", config: &Config{ - Endpoint: "x;;ef;s;d:::ss:23423423423423423", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "x;;ef;s;d:::ss:23423423423423423", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "missing host", config: &Config{ - Endpoint: ":3001", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: ":3001", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "negative port", config: &Config{ - Endpoint: "localhost:-2", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:-2", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "bad port", config: &Config{ - Endpoint: "localhost:9999999999999999999", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:9999999999999999999", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "negative timeout", config: &Config{ - Endpoint: "localhost:3000", - Timeout: -1 * time.Second, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Timeout: -1 * time.Second, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errNegativeTimeout, }, { name: "password but no username", config: &Config{ - Endpoint: "localhost:3000", - Username: "", - Password: "secret", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "", + Password: "secret", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyUsername, }, { name: "username but no password", config: &Config{ - Endpoint: "localhost:3000", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyPassword, }, @@ -104,13 +104,13 @@ func TestValidate(t *testing.T) { config: &Config{ Endpoint: "localhost:3000", TLSName: "tls1", - TLS: &configtls.TLSClientSetting{ + TLS: &configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "BADCAFILE", }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errFailedTLSLoad, }, @@ -119,11 +119,11 @@ func TestValidate(t *testing.T) { config: &Config{ Endpoint: "localhost:3000", TLSName: "", - TLS: &configtls.TLSClientSetting{ + TLS: &configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{}, + TLSSetting: configtls.Config{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpointTLSName, }, diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index 63f15633f252..775ee2f8ad18 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -54,17 +54,17 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Endpoint: defaultEndpoint, - Timeout: defaultTimeout, - CollectClusterMetrics: defaultCollectClusterMetrics, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Endpoint: defaultEndpoint, + Timeout: defaultTimeout, + CollectClusterMetrics: defaultCollectClusterMetrics, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index fa3607d53731..905f7a185170 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,16 +74,16 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -96,7 +96,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index a67bd5b892cd..f68b0eed891c 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -126,8 +126,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -156,26 +156,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/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -223,7 +223,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -244,8 +243,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/aerospikereceiver/integration_test.go b/receiver/aerospikereceiver/integration_test.go index bbdce7ed4138..40e5f2013888 100644 --- a/receiver/aerospikereceiver/integration_test.go +++ b/receiver/aerospikereceiver/integration_test.go @@ -57,7 +57,7 @@ func integrationTest(cfgMod func(*Config)) func(*testing.T) { func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) rCfg.Endpoint = fmt.Sprintf("%s:%s", ci.Host(t), ci.MappedPort(t, aerospikePort)) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfgMod(rCfg) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachereceiver/config.go b/receiver/apachereceiver/config.go index b78ca79afdce..98c507513fd2 100644 --- a/receiver/apachereceiver/config.go +++ b/receiver/apachereceiver/config.go @@ -14,9 +14,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } var ( diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index ab17714fd2b1..f043a66c0c20 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -31,11 +31,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -80,7 +80,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index 05437004d6f4..9998bfb9e072 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -34,7 +34,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, }, diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 79d92f34dc59..6d5633517282 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -76,21 +76,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -104,7 +104,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index cb198a185603..4f86baf4e026 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,40 +150,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,7 +233,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -254,8 +254,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/apachereceiver/integration_test.go b/receiver/apachereceiver/integration_test.go index c4384776e393..ff7666ebbc3d 100644 --- a/receiver/apachereceiver/integration_test.go +++ b/receiver/apachereceiver/integration_test.go @@ -42,7 +42,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/server-status?auto", ci.Host(t), ci.MappedPort(t, apachePort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index ab17716b64f5..0a021c473c02 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -58,8 +58,8 @@ func TestScraperFailedStart(t *testing.T) { sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/apachesparkreceiver/config.go b/receiver/apachesparkreceiver/config.go index d9a44689237c..7b89ef0724c8 100644 --- a/receiver/apachesparkreceiver/config.go +++ b/receiver/apachesparkreceiver/config.go @@ -25,10 +25,10 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - ApplicationNames []string `mapstructure:"application_names"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + ApplicationNames []string `mapstructure:"application_names"` } // Validate validates missing and invalid configuration fields. diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go index 2e43e5a5c551..ec4af2033d67 100644 --- a/receiver/apachesparkreceiver/config_test.go +++ b/receiver/apachesparkreceiver/config_test.go @@ -9,8 +9,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -22,7 +20,7 @@ func TestValidate(t *testing.T) { { desc: "default config", cfg: &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, @@ -32,7 +30,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errInvalidEndpoint, }, diff --git a/receiver/apachesparkreceiver/factory.go b/receiver/apachesparkreceiver/factory.go index 1568c270993b..da8aa14e13b3 100644 --- a/receiver/apachesparkreceiver/factory.go +++ b/receiver/apachesparkreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for Spark with as many default values as possible func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, @@ -59,6 +59,6 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&sparkConfig.ScraperControllerSettings, params, + return scraperhelper.NewScraperControllerReceiver(&sparkConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/apachesparkreceiver/factory_test.go b/receiver/apachesparkreceiver/factory_test.go index 82e89ec4b639..11f9b775c6c7 100644 --- a/receiver/apachesparkreceiver/factory_test.go +++ b/receiver/apachesparkreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, InitialDelay: time.Second, }, diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index 75a92b53621b..29c7fbf3d289 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -75,23 +75,23 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index b18792508133..8670b95423e1 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -256,8 +256,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/apachesparkreceiver/integration_test.go b/receiver/apachesparkreceiver/integration_test.go index b7eb7d19c771..eb567b2dc769 100644 --- a/receiver/apachesparkreceiver/integration_test.go +++ b/receiver/apachesparkreceiver/integration_test.go @@ -36,7 +36,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 3 * time.Second + rCfg.ControllerConfig.CollectionInterval = 3 * time.Second rCfg.Endpoint = fmt.Sprintf("http://%s:%s", ci.Host(t), ci.MappedPort(t, sparkPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/apachesparkreceiver/scraper_test.go b/receiver/apachesparkreceiver/scraper_test.go index 45cc574bb5b7..c01b93bfb4f5 100644 --- a/receiver/apachesparkreceiver/scraper_test.go +++ b/receiver/apachesparkreceiver/scraper_test.go @@ -65,7 +65,7 @@ func TestScraper(t *testing.T) { expectedMetricGen: func(*testing.T) pmetric.Metrics { return pmetric.NewMetrics() }, - config: &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + config: &Config{ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"local-123", "local-987"}, @@ -212,7 +212,7 @@ func TestScraper(t *testing.T) { require.NoError(t, err) return expectedMetrics }, - config: &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + config: &Config{ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"streaming-example"}, diff --git a/receiver/awscloudwatchmetricsreceiver/go.mod b/receiver/awscloudwatchmetricsreceiver/go.mod index cfe0b8ca17de..3f9d1ce16902 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.mod +++ b/receiver/awscloudwatchmetricsreceiver/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -23,6 +23,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -36,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -47,7 +48,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/awscloudwatchmetricsreceiver/go.sum b/receiver/awscloudwatchmetricsreceiver/go.sum index c05ad6cf2c0f..56cb9569b01c 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.sum +++ b/receiver/awscloudwatchmetricsreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,18 +66,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index df06307a577b..746974520f60 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -43,7 +44,7 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -53,7 +54,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index ad4569232baa..495be1090e51 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -72,18 +74,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -135,8 +137,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index c417afa425f1..a1cb10591bf4 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/aws/aws-sdk-go v1.50.27 - github.com/google/cadvisor v0.48.1 + github.com/google/cadvisor v0.49.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.96.0 @@ -13,20 +13,20 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.96.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 - k8s.io/klog/v2 v2.110.1 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 + k8s.io/klog/v2 v2.120.1 ) require ( @@ -62,7 +62,7 @@ require ( github.com/godbus/dbus/v5 v5.0.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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -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.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -139,7 +139,7 @@ require ( golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 89b305e7d9b6..5dc7a3af0ad8 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -106,7 +106,6 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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= @@ -161,14 +160,14 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/cadvisor v0.48.1 h1:eyYTxKBd+KxI1kh6rst4JSTLUhfHQM34qGpp+0AMlSg= -github.com/google/cadvisor v0.48.1/go.mod h1:ZkYbiiVdyoqBmI2ahZI8GlmirT78OAOER0z4EQugkxQ= +github.com/google/cadvisor v0.49.1 h1:9M++63nWvdq6Oci6wUDuAfQNTZpuz1ZObln0Bhs9xN0= +github.com/google/cadvisor v0.49.1/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -385,38 +384,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -674,8 +673,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -720,22 +719,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= diff --git a/receiver/awscontainerinsightreceiver/receiver.go b/receiver/awscontainerinsightreceiver/receiver.go index d192977a1341..518214fb1c62 100644 --- a/receiver/awscontainerinsightreceiver/receiver.go +++ b/receiver/awscontainerinsightreceiver/receiver.go @@ -44,9 +44,6 @@ func newAWSContainerInsightReceiver( settings component.TelemetrySettings, config *Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } r := &awsContainerInsightReceiver{ settings: settings, diff --git a/receiver/awscontainerinsightreceiver/receiver_test.go b/receiver/awscontainerinsightreceiver/receiver_test.go index abe070785c74..f6b8ee900330 100644 --- a/receiver/awscontainerinsightreceiver/receiver_test.go +++ b/receiver/awscontainerinsightreceiver/receiver_test.go @@ -63,18 +63,6 @@ func TestReceiver(t *testing.T) { require.NoError(t, err) } -func TestReceiverForNilConsumer(t *testing.T) { - cfg := createDefaultConfig().(*Config) - metricsReceiver, err := newAWSContainerInsightReceiver( - componenttest.NewNopTelemetrySettings(), - cfg, - nil, - ) - - require.Error(t, err) - require.Nil(t, metricsReceiver) -} - func TestCollectData(t *testing.T) { cfg := createDefaultConfig().(*Config) metricsReceiver, err := newAWSContainerInsightReceiver( diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index b643a247d230..98a3710a6c48 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,16 +49,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 28ab14f417e2..35a2a58013ee 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -29,6 +29,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -78,40 +80,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -165,8 +167,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/awsecscontainermetricsreceiver/receiver.go b/receiver/awsecscontainermetricsreceiver/receiver.go index 3004c7cda24a..d4972aac39f0 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver.go +++ b/receiver/awsecscontainermetricsreceiver/receiver.go @@ -34,10 +34,6 @@ func newAWSECSContainermetrics( config *Config, nextConsumer consumer.Metrics, rest ecsutil.RestClient) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - r := &awsEcsContainerMetricsReceiver{ logger: logger, nextConsumer: nextConsumer, diff --git a/receiver/awsecscontainermetricsreceiver/receiver_test.go b/receiver/awsecscontainermetricsreceiver/receiver_test.go index 88bc97f13a3b..ecfcf88cd218 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver_test.go +++ b/receiver/awsecscontainermetricsreceiver/receiver_test.go @@ -53,19 +53,6 @@ func TestReceiver(t *testing.T) { require.NoError(t, err) } -func TestReceiverForNilConsumer(t *testing.T) { - cfg := createDefaultConfig().(*Config) - metricsReceiver, err := newAWSECSContainermetrics( - zap.NewNop(), - cfg, - nil, - &fakeRestClient{}, - ) - - require.Error(t, err) - require.Nil(t, metricsReceiver) -} - func TestCollectDataFromEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) metricsReceiver, err := newAWSECSContainermetrics( diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 2963f517bc16..951330deb349 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -35,8 +35,8 @@ func TestLoadConfig(t *testing.T) { AccessKey: "some_access_key", ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:4433", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "server.crt", KeyFile: "server.key", }, diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index e42914da47fc..2977130348ae 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -5,15 +5,15 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,14 +49,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -66,7 +67,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 461c18b43164..db13425c7c66 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,40 +76,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/awsfirehosereceiver/metrics_receiver.go b/receiver/awsfirehosereceiver/metrics_receiver.go index ccbe318014b6..dc3b6cca2fa1 100644 --- a/receiver/awsfirehosereceiver/metrics_receiver.go +++ b/receiver/awsfirehosereceiver/metrics_receiver.go @@ -7,7 +7,6 @@ import ( "context" "net/http" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" @@ -35,9 +34,6 @@ func newMetricsReceiver( unmarshalers map[string]unmarshaler.MetricsUnmarshaler, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } configuredUnmarshaler := unmarshalers[config.RecordType] if configuredUnmarshaler == nil { diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index a17007b65a5d..caef308eef43 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -37,20 +37,21 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "0.0.0.0:5678", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, ProxyServer: &proxy.Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: "0.0.0.0:2000", }, ProxyAddress: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, ServerName: "", }, Region: "", RoleARN: "", AWSEndpoint: "", + ServiceName: "xray", }, }, }, @@ -59,14 +60,14 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "0.0.0.0:2000", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, ProxyServer: &proxy.Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: "0.0.0.0:1234", }, ProxyAddress: "https://proxy.proxy.com", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, ServerName: "something", }, @@ -74,6 +75,7 @@ func TestLoadConfig(t *testing.T) { RoleARN: "arn:aws:iam::123456789012:role/awesome_role", AWSEndpoint: "https://another.aws.endpoint.com", LocalMode: true, + ServiceName: "xray", }, }}, } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index fd5a37ea264c..980584a6863e 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -53,20 +53,20 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index d5ee352b3148..ad944728c70a 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -76,30 +76,30 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,16 +127,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -151,8 +151,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index 887ba542adbe..6b29dc2b6846 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -42,14 +42,10 @@ func newReceiver(config *Config, consumer consumer.Traces, set receiver.CreateSettings) (receiver.Traces, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } - set.Logger.Info("Going to listen on endpoint for X-Ray segments", zap.String(udppoller.Transport, config.Endpoint)) poller, err := udppoller.New(&udppoller.Config{ - Transport: config.Transport, + Transport: string(config.Transport), Endpoint: config.Endpoint, NumOfPollerToStart: maxPollerCount, }, set) diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index afa31c112092..1cd5a8a38d16 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -67,7 +67,7 @@ func TestPollerCreationFailed(t *testing.T) { &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "dontCare", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, sink, diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 6214a2ae6ceb..6103c6c470af 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.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -67,7 +67,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.6.0 // indirect github.com/spf13/cobra v1.8.0 // indirect @@ -75,23 +75,23 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -115,7 +115,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 98385e9c6e23..448f424602f9 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -179,8 +179,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -210,58 +210,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -350,7 +350,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -389,8 +389,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index beab89e196c3..b65a911f6ad4 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.96.0 github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -72,28 +72,28 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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/valyala/fastjson v1.6.4 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -115,10 +115,10 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 17d3945664a5..520d5a86cb58 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -165,8 +165,8 @@ github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -199,58 +199,58 @@ 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= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -343,7 +343,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -368,8 +368,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/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= @@ -386,8 +386,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/azuremonitorreceiver/config.go b/receiver/azuremonitorreceiver/config.go index 5037a08d9b29..743fa94f5bb7 100644 --- a/receiver/azuremonitorreceiver/config.go +++ b/receiver/azuremonitorreceiver/config.go @@ -229,21 +229,21 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - Cloud string `mapstructure:"cloud"` - SubscriptionID string `mapstructure:"subscription_id"` - Authentication string `mapstructure:"auth"` - TenantID string `mapstructure:"tenant_id"` - ClientID string `mapstructure:"client_id"` - ClientSecret string `mapstructure:"client_secret"` - FederatedTokenFile string `mapstructure:"federated_token_file"` - ResourceGroups []string `mapstructure:"resource_groups"` - Services []string `mapstructure:"services"` - CacheResources float64 `mapstructure:"cache_resources"` - CacheResourcesDefinitions float64 `mapstructure:"cache_resources_definitions"` - MaximumNumberOfMetricsInACall int `mapstructure:"maximum_number_of_metrics_in_a_call"` - AppendTagsAsAttributes bool `mapstructure:"append_tags_as_attributes"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + Cloud string `mapstructure:"cloud"` + SubscriptionID string `mapstructure:"subscription_id"` + Authentication string `mapstructure:"auth"` + TenantID string `mapstructure:"tenant_id"` + ClientID string `mapstructure:"client_id"` + ClientSecret string `mapstructure:"client_secret"` + FederatedTokenFile string `mapstructure:"federated_token_file"` + ResourceGroups []string `mapstructure:"resource_groups"` + Services []string `mapstructure:"services"` + CacheResources float64 `mapstructure:"cache_resources"` + CacheResourcesDefinitions float64 `mapstructure:"cache_resources_definitions"` + MaximumNumberOfMetricsInACall int `mapstructure:"maximum_number_of_metrics_in_a_call"` + AppendTagsAsAttributes bool `mapstructure:"append_tags_as_attributes"` } const ( diff --git a/receiver/azuremonitorreceiver/factory.go b/receiver/azuremonitorreceiver/factory.go index 96800cbea13c..d4da332dba8f 100644 --- a/receiver/azuremonitorreceiver/factory.go +++ b/receiver/azuremonitorreceiver/factory.go @@ -32,11 +32,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, @@ -59,5 +59,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/azuremonitorreceiver/factory_test.go b/receiver/azuremonitorreceiver/factory_test.go index 6210a428c8bc..80a4134f0a65 100644 --- a/receiver/azuremonitorreceiver/factory_test.go +++ b/receiver/azuremonitorreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index 23226da62dda..8e8105ecb2fd 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -52,8 +52,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -63,7 +63,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/azuremonitorreceiver/go.sum b/receiver/azuremonitorreceiver/go.sum index 8efd19db8d9a..e43f07a6d21f 100644 --- a/receiver/azuremonitorreceiver/go.sum +++ b/receiver/azuremonitorreceiver/go.sum @@ -88,20 +88,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -156,8 +156,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/azuremonitorreceiver/scraper.go b/receiver/azuremonitorreceiver/scraper.go index 76492a47c55c..8aa4598c4364 100644 --- a/receiver/azuremonitorreceiver/scraper.go +++ b/receiver/azuremonitorreceiver/scraper.go @@ -95,9 +95,9 @@ func newScraper(conf *Config, settings receiver.CreateSettings) *azureScraper { type azureScraper struct { cred azcore.TokenCredential - clientResources ArmClient - clientMetricsDefinitions MetricsDefinitionsClientInterface - clientMetricsValues MetricsValuesClient + clientResources armClient + clientMetricsDefinitions metricsDefinitionsClientInterface + clientMetricsValues metricsValuesClient cfg *Config settings component.TelemetrySettings @@ -113,7 +113,7 @@ type azureScraper struct { mutex *sync.Mutex } -type ArmClient interface { +type armClient interface { NewListPager(options *armresources.ClientListOptions) *runtime.Pager[armresources.ClientListResponse] } @@ -134,27 +134,27 @@ func (s *azureScraper) getArmClientOptions() *arm.ClientOptions { return &options } -func (s *azureScraper) getArmClient() ArmClient { +func (s *azureScraper) getArmClient() armClient { client, _ := s.armClientFunc(s.cfg.SubscriptionID, s.cred, s.armClientOptions) return client } -type MetricsDefinitionsClientInterface interface { +type metricsDefinitionsClientInterface interface { NewListPager(resourceURI string, options *armmonitor.MetricDefinitionsClientListOptions) *runtime.Pager[armmonitor.MetricDefinitionsClientListResponse] } -func (s *azureScraper) getMetricsDefinitionsClient() MetricsDefinitionsClientInterface { +func (s *azureScraper) getMetricsDefinitionsClient() metricsDefinitionsClientInterface { client, _ := s.armMonitorDefinitionsClientFunc(s.cfg.SubscriptionID, s.cred, s.armClientOptions) return client } -type MetricsValuesClient interface { +type metricsValuesClient interface { List(ctx context.Context, resourceURI string, options *armmonitor.MetricsClientListOptions) ( armmonitor.MetricsClientListResponse, error, ) } -func (s *azureScraper) GetMetricsValuesClient() MetricsValuesClient { +func (s *azureScraper) GetMetricsValuesClient() metricsValuesClient { client, _ := s.armMonitorMetricsClientFunc(s.cfg.SubscriptionID, s.cred, s.armClientOptions) return client } diff --git a/receiver/azuremonitorreceiver/scraper_test.go b/receiver/azuremonitorreceiver/scraper_test.go index 200f3001e6b5..794a4d5e1fc2 100644 --- a/receiver/azuremonitorreceiver/scraper_test.go +++ b/receiver/azuremonitorreceiver/scraper_test.go @@ -85,7 +85,7 @@ func TestAzureScraperStart(t *testing.T) { name: "service_principal", testFunc: func(t *testing.T) { customCfg := &Config{ - ScraperControllerSettings: cfg.ScraperControllerSettings, + ControllerConfig: cfg.ControllerConfig, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, @@ -113,7 +113,7 @@ func TestAzureScraperStart(t *testing.T) { name: "workload_identity", testFunc: func(t *testing.T) { customCfg := &Config{ - ScraperControllerSettings: cfg.ScraperControllerSettings, + ControllerConfig: cfg.ControllerConfig, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), CacheResources: 24 * 60 * 60, CacheResourcesDefinitions: 24 * 60 * 60, diff --git a/receiver/bigipreceiver/client_test.go b/receiver/bigipreceiver/client_test.go index 21a117de939a..74ddbe971dfd 100644 --- a/receiver/bigipreceiver/client_test.go +++ b/receiver/bigipreceiver/client_test.go @@ -50,8 +50,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -66,7 +66,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/bigipreceiver/config.go b/receiver/bigipreceiver/config.go index 5e66b666b5e7..8b3617c9d5c2 100644 --- a/receiver/bigipreceiver/config.go +++ b/receiver/bigipreceiver/config.go @@ -27,11 +27,11 @@ 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.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index 83f35267e831..7b175fb67d2b 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -34,7 +34,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -48,7 +48,7 @@ func TestValidate(t *testing.T) { Username: "otelu", ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", - }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + }, ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingPassword, @@ -62,7 +62,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -77,7 +77,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -91,7 +91,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index 5ab5837425bf..3beeba20de2d 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -30,7 +30,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for Big-IP with as many default values as possible func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ @@ -54,5 +54,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index 6286f39232e3..5c338b077a53 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 7227aa579684..187330b4bbb0 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,22 +77,22 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index b18792508133..8670b95423e1 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -256,8 +256,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index 066a289c19be..37f3c3f171d7 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -38,8 +38,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -54,7 +54,7 @@ func TestScraperStart(t *testing.T) { scraper: &bigipScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/carbonreceiver/config_test.go b/receiver/carbonreceiver/config_test.go index f0d02afa21aa..0bad1d073655 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:8080", - Transport: "udp", + Transport: confignet.TransportTypeUDP, }, TCPIdleTimeout: 5 * time.Second, Parser: &protocol.Config{ @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: 30 * time.Second, Parser: &protocol.Config{ @@ -97,7 +97,7 @@ func TestConfigValidate(t *testing.T) { cfg := &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: -1 * time.Second, Parser: &protocol.Config{ diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index f50d438b296b..45bab1161df5 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -35,7 +35,7 @@ func createDefaultConfig() component.Config { return &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: tcpIdleTimeoutDefault, Parser: &protocol.Config{ diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e4714836349f..9cf33ebe0df7 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -52,7 +53,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 43bbce04bbaf..bc1b949d29a5 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -64,24 +66,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -133,8 +135,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/carbonreceiver/receiver.go b/receiver/carbonreceiver/receiver.go index a75153d351f3..f9b4ade581e2 100644 --- a/receiver/carbonreceiver/receiver.go +++ b/receiver/carbonreceiver/receiver.go @@ -42,10 +42,6 @@ func newMetricsReceiver( nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - if config.Endpoint == "" { return nil, errEmptyEndpoint } @@ -80,14 +76,14 @@ func newMetricsReceiver( } func buildTransportServer(config Config) (transport.Server, error) { - switch strings.ToLower(config.Transport) { + switch strings.ToLower(string(config.Transport)) { case "", "tcp": return transport.NewTCPServer(config.Endpoint, config.TCPIdleTimeout) case "udp": return transport.NewUDPServer(config.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q", config.Transport) + return nil, fmt.Errorf("unsupported transport %q", string(config.Transport)) } // Start tells the receiver to start its processing. diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index 8697b4f5c109..0a4ccf5cbfac 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -70,7 +70,7 @@ func Test_carbonreceiver_New(t *testing.T) { config: Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:2003", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, Parser: &protocol.Config{ Type: "regex", @@ -173,7 +173,7 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { name: "default_config_udp", configFn: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.Transport = "udp" + cfg.Transport = confignet.TransportTypeUDP return cfg }, clientFn: func(t *testing.T) func(client.Metric) error { diff --git a/receiver/chronyreceiver/config.go b/receiver/chronyreceiver/config.go index e1d27c799f2a..0782c55526c3 100644 --- a/receiver/chronyreceiver/config.go +++ b/receiver/chronyreceiver/config.go @@ -16,8 +16,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` // Endpoint is the published address or unix socket // that allows clients to connect to: // The allowed format is: @@ -35,11 +35,11 @@ var ( ) func newDefaultCongfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.Timeout = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), Endpoint: "unix:///var/run/chrony/chronyd.sock", } diff --git a/receiver/chronyreceiver/config_test.go b/receiver/chronyreceiver/config_test.go index 0a8a476af87e..65e5d91b3438 100644 --- a/receiver/chronyreceiver/config_test.go +++ b/receiver/chronyreceiver/config_test.go @@ -33,13 +33,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.Timeout = 10 * time.Second assert.Equal(t, &Config{ - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Endpoint: "udp://localhost:3030", + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Endpoint: "udp://localhost:3030", }, cfg) } @@ -55,7 +55,7 @@ func TestValidate(t *testing.T) { scenario: "Valid udp configuration", conf: Config{ Endpoint: "udp://localhost:323", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -67,7 +67,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid udp hostname", conf: Config{ Endpoint: "udp://:323", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -79,7 +79,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid udp port", conf: Config{ Endpoint: "udp://localhost", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -91,7 +91,7 @@ func TestValidate(t *testing.T) { scenario: "Valid unix path", conf: Config{ Endpoint: fmt.Sprintf("unix://%s", t.TempDir()), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -103,7 +103,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid unix path", conf: Config{ Endpoint: "unix:///no/dir/to/socket", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 10 * time.Second, @@ -115,7 +115,7 @@ func TestValidate(t *testing.T) { scenario: "Invalid timeout set", conf: Config{ Endpoint: "unix://no/dir/to/socket", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: time.Minute, InitialDelay: time.Second, Timeout: 0, diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index 3ca0008dab82..fda31095d64a 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -49,7 +49,7 @@ func newMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/chronyreceiver/factory_test.go b/receiver/chronyreceiver/factory_test.go index 50e7dc4b82c8..9c95a21d0b4f 100644 --- a/receiver/chronyreceiver/factory_test.go +++ b/receiver/chronyreceiver/factory_test.go @@ -48,7 +48,7 @@ func TestCreatingMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, Timeout: 10 * time.Second, }, diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 8ae77e3d0d1b..6f9fcba09255 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.9.0 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -43,8 +44,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -53,7 +54,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index af075fc7205f..54efe436eecb 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -71,20 +73,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -137,8 +139,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/cloudflarereceiver/config.go b/receiver/cloudflarereceiver/config.go index a532da47419c..59ef966c0d75 100644 --- a/receiver/cloudflarereceiver/config.go +++ b/receiver/cloudflarereceiver/config.go @@ -18,11 +18,11 @@ type Config struct { } type LogsConfig struct { - Secret string `mapstructure:"secret"` - Endpoint string `mapstructure:"endpoint"` - TLS *configtls.TLSServerSetting `mapstructure:"tls"` - Attributes map[string]string `mapstructure:"attributes"` - TimestampField string `mapstructure:"timestamp_field"` + Secret string `mapstructure:"secret"` + Endpoint string `mapstructure:"endpoint"` + TLS *configtls.ServerConfig `mapstructure:"tls"` + Attributes map[string]string `mapstructure:"attributes"` + TimestampField string `mapstructure:"timestamp_field"` } var ( diff --git a/receiver/cloudflarereceiver/config_test.go b/receiver/cloudflarereceiver/config_test.go index b5335f7181fa..e541cf92db01 100644 --- a/receiver/cloudflarereceiver/config_test.go +++ b/receiver/cloudflarereceiver/config_test.go @@ -34,8 +34,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", KeyFile: "some_key_file", }, @@ -64,8 +64,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", }, }, @@ -78,8 +78,8 @@ func TestValidate(t *testing.T) { config: Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:9999", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ KeyFile: "some_key_file", }, }, @@ -114,8 +114,8 @@ func TestLoadConfig(t *testing.T) { expectedConfig: &Config{ Logs: LogsConfig{ Endpoint: "0.0.0.0:12345", - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", KeyFile: "some_key_file", }, diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod index ab0b93ad706a..2aeb2098d753 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -45,9 +46,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -56,7 +57,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum index 22c489430e38..d1a14d9f6e51 100644 --- a/receiver/cloudflarereceiver/go.sum +++ b/receiver/cloudflarereceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -68,24 +70,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -137,8 +139,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/cloudflarereceiver/logs_integration_test.go b/receiver/cloudflarereceiver/logs_integration_test.go index bf95f031f4fd..6a16bf2b3afd 100644 --- a/receiver/cloudflarereceiver/logs_integration_test.go +++ b/receiver/cloudflarereceiver/logs_integration_test.go @@ -56,8 +56,8 @@ func TestReceiverTLS(t *testing.T) { Logs: LogsConfig{ Secret: testSecret, Endpoint: testAddr, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "cert", "server.crt"), KeyFile: filepath.Join("testdata", "cert", "server.key"), }, diff --git a/receiver/cloudflarereceiver/logs_test.go b/receiver/cloudflarereceiver/logs_test.go index 6a0ac738da63..9df7c91376bd 100644 --- a/receiver/cloudflarereceiver/logs_test.go +++ b/receiver/cloudflarereceiver/logs_test.go @@ -115,7 +115,7 @@ func TestPayloadToLogRecord(t *testing.T) { recv := newReceiver(t, &Config{ Logs: LogsConfig{ Endpoint: "localhost:0", - TLS: &configtls.TLSServerSetting{}, + TLS: &configtls.ServerConfig{}, TimestampField: "EdgeStartTimestamp", Attributes: map[string]string{ "ClientIP": "http_request.client_ip", @@ -310,7 +310,7 @@ func TestHandleRequest(t *testing.T) { Attributes: map[string]string{ "ClientIP": "http_request.client_ip", }, - TLS: &configtls.TLSServerSetting{}, + TLS: &configtls.ServerConfig{}, }, }, consumer, diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index b8083f1da023..110d0d95a6b3 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { RLPGateway: RLPGatewayConfig{ ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, Timeout: time.Second * 20, @@ -106,7 +106,7 @@ func TestHTTPConfigurationStructConsistency(t *testing.T) { // library does not support. 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{})) + checkTypeFieldMatch(t, "InsecureSkipVerify", reflect.TypeOf(LimitedTLSClientSetting{}), reflect.TypeOf(configtls.ClientConfig{})) } func loadSuccessfulConfig(t *testing.T) *Config { @@ -115,7 +115,7 @@ func loadSuccessfulConfig(t *testing.T) *Config { ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", Timeout: time.Second * 20, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: true, }, }, diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index 38ae50a0c76f..9ce95b4495f5 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { RLPGateway: RLPGatewayConfig{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultURL, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ InsecureSkipVerify: false, }, }, diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index dfff5f7c7994..3e2976d7482c 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.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -70,7 +71,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 4d70c42f8cd8..3d8883d9793c 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -49,6 +49,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -112,38 +114,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -212,8 +214,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 702fd87e1058..45d0a18ec159 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -43,10 +43,6 @@ func newCloudFoundryReceiver( config Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: settings.ID, Transport: transport, diff --git a/receiver/cloudfoundryreceiver/receiver_test.go b/receiver/cloudfoundryreceiver/receiver_test.go index 794afb0ef93d..e404a71aacfb 100644 --- a/receiver/cloudfoundryreceiver/receiver_test.go +++ b/receiver/cloudfoundryreceiver/receiver_test.go @@ -37,19 +37,3 @@ func TestDefaultValidReceiver(t *testing.T) { err = receiver.Shutdown(ctx) require.NoError(t, err) } - -// Test to make sure start fails with invalid consumer -func TestInvalidConsumer(t *testing.T) { - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - params := receivertest.NewNopCreateSettings() - - receiver, err := newCloudFoundryReceiver( - params, - *cfg, - nil, - ) - - require.EqualError(t, err, "nil next Consumer") - require.Nil(t, receiver, "receiver creation failed") -} diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index c3712abcc002..b9ef97406123 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -49,16 +50,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 55692aed9ba6..765decb76527 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -159,8 +161,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index 49ce8e27e1d6..0cb8a352c177 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -41,9 +41,6 @@ func newCollectdReceiver( defaultAttrsPrefix string, nextConsumer consumer.Metrics, createSettings receiver.CreateSettings) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } r := &collectdReceiver{ logger: logger, diff --git a/receiver/couchdbreceiver/client_test.go b/receiver/couchdbreceiver/client_test.go index 803eec0603ef..15b351102d5d 100644 --- a/receiver/couchdbreceiver/client_test.go +++ b/receiver/couchdbreceiver/client_test.go @@ -35,8 +35,8 @@ func TestNewCouchDBClient(t *testing.T) { &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/couchdbreceiver/config.go b/receiver/couchdbreceiver/config.go index 5a47ca552ec2..cebd78f403ef 100644 --- a/receiver/couchdbreceiver/config.go +++ b/receiver/couchdbreceiver/config.go @@ -29,11 +29,11 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate validates missing and invalid configuration fields. diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index b7a19667d8c9..0efeb01635aa 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -45,8 +45,8 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Username: "otelu", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Username: "otelu", }, expectedErr: multierr.Combine( errMissingPassword, @@ -59,8 +59,8 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Password: "otelp", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Password: "otelp", }, expectedErr: multierr.Combine( errMissingUsername, @@ -75,7 +75,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: fmt.Errorf(errInvalidEndpoint.Error(), "parse \"http://localhost :5984\": invalid character \" \" in host name"), }, @@ -87,7 +87,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:5984", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index baeebf8359d0..d6fd2bab515c 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -27,10 +27,10 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, Timeout: 1 * time.Minute, }, @@ -51,7 +51,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 7bb67fdadfc7..4497cb8ee1c9 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 1dbb8dfdc08f..9697de4b59e2 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index e6a928129a9d..2bef11776465 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/stretchr/testify v1.9.0 github.com/vmihailenco/msgpack/v4 v4.3.13 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,16 +53,16 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -73,7 +74,7 @@ require ( golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index 00e9f9220b41..0019bb1610cf 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -34,6 +34,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -94,40 +96,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -201,8 +203,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go index bf4286c9b4e2..f0a40f46560f 100644 --- a/receiver/datadogreceiver/receiver.go +++ b/receiver/datadogreceiver/receiver.go @@ -26,9 +26,6 @@ type datadogReceiver struct { } func newDataDogReceiver(config *Config, nextConsumer consumer.Traces, params receiver.CreateSettings) (receiver.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } instance, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{LongLivedCtx: false, ReceiverID: params.ID, Transport: "http", ReceiverCreateSettings: params}) if err != nil { diff --git a/receiver/dockerstatsreceiver/config.go b/receiver/dockerstatsreceiver/config.go index d7d18f5172c6..86825de8c65e 100644 --- a/receiver/dockerstatsreceiver/config.go +++ b/receiver/dockerstatsreceiver/config.go @@ -16,7 +16,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The URL of the docker server. Default is "unix:///var/run/docker.sock" Endpoint string `mapstructure:"endpoint"` diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index 6713673d388f..d9a7db9f450d 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Second, InitialDelay: time.Second, Timeout: 20 * time.Second, @@ -91,20 +91,20 @@ func TestLoadConfig(t *testing.T) { } func TestValidateErrors(t *testing.T) { - cfg := &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)} + cfg := &Config{ControllerConfig: scraperhelper.NewDefaultControllerConfig()} assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{ - DockerAPIVersion: "1.21", - Endpoint: "someEndpoint", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, + DockerAPIVersion: "1.21", + Endpoint: "someEndpoint", + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: 1 * time.Second}, } assert.Equal(t, `"api_version" 1.21 must be at least 1.25`, component.ValidateConfig(cfg).Error()) cfg = &Config{ - Endpoint: "someEndpoint", - DockerAPIVersion: "1.25", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{}, + Endpoint: "someEndpoint", + DockerAPIVersion: "1.25", + ControllerConfig: scraperhelper.ControllerConfig{}, } assert.Equal(t, `"collection_interval": requires positive value`, component.ValidateConfig(cfg).Error()) } diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index c96a9dfaed55..9a643160af97 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -32,14 +32,14 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second scs.Timeout = 5 * time.Second return &Config{ - ScraperControllerSettings: scs, - Endpoint: "unix:///var/run/docker.sock", - DockerAPIVersion: defaultDockerAPIVersion, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + Endpoint: "unix:///var/run/docker.sock", + DockerAPIVersion: defaultDockerAPIVersion, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -52,10 +52,10 @@ func createMetricsReceiver( dockerConfig := config.(*Config) dsr := newMetricsReceiver(params, dockerConfig) - scrp, err := scraperhelper.NewScraper(metadata.Type.String(), dsr.scrapeV2, scraperhelper.WithStart(dsr.start)) + scrp, err := scraperhelper.NewScraper(metadata.Type.String(), dsr.scrapeV2, scraperhelper.WithStart(dsr.start), scraperhelper.WithShutdown(dsr.shutdown)) if err != nil { return nil, err } - return scraperhelper.NewScraperControllerReceiver(&dsr.config.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&dsr.config.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp)) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 5c72ed94f5d0..754bfed50b40 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,14 +74,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -93,7 +93,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 4d27d8a058b1..c7073cc0585a 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -118,8 +118,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -144,26 +144,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -211,7 +211,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -232,8 +231,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/dockerstatsreceiver/package_test.go b/receiver/dockerstatsreceiver/package_test.go new file mode 100644 index 000000000000..1e0123693b89 --- /dev/null +++ b/receiver/dockerstatsreceiver/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package dockerstatsreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/receiver/dockerstatsreceiver/receiver.go b/receiver/dockerstatsreceiver/receiver.go index 5581ed1021a4..071d737d6329 100644 --- a/receiver/dockerstatsreceiver/receiver.go +++ b/receiver/dockerstatsreceiver/receiver.go @@ -40,6 +40,7 @@ type metricsReceiver struct { settings receiver.CreateSettings client *docker.Client mb *metadata.MetricsBuilder + cancel context.CancelFunc } func newMetricsReceiver(set receiver.CreateSettings, config *Config) *metricsReceiver { @@ -65,7 +66,17 @@ func (r *metricsReceiver) start(ctx context.Context, _ component.Host) error { return err } - go r.client.ContainerEventLoop(ctx) + cctx, cancel := context.WithCancel(ctx) + r.cancel = cancel + + go r.client.ContainerEventLoop(cctx) + return nil +} + +func (r *metricsReceiver) shutdown(context.Context) error { + if r.cancel != nil { + r.cancel() + } return nil } diff --git a/receiver/dockerstatsreceiver/receiver_test.go b/receiver/dockerstatsreceiver/receiver_test.go index 26d973647e4f..c5b2844a407a 100644 --- a/receiver/dockerstatsreceiver/receiver_test.go +++ b/receiver/dockerstatsreceiver/receiver_test.go @@ -119,7 +119,7 @@ var ( func TestNewReceiver(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, }, Endpoint: "unix:///run/some.sock", @@ -132,7 +132,7 @@ func TestNewReceiver(t *testing.T) { func TestErrorsInStart(t *testing.T) { unreachable := "unix:///not/a/thing.sock" cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, }, Endpoint: unreachable, @@ -301,6 +301,7 @@ func TestScrapeV2(t *testing.T) { receivertest.NewNopCreateSettings(), tc.cfgBuilder.withEndpoint(mockDockerEngine.URL).build()) err := receiver.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) + defer func() { require.NoError(t, receiver.shutdown(context.Background())) }() actualMetrics, err := receiver.scrapeV2(context.Background()) require.NoError(t, err) diff --git a/receiver/elasticsearchreceiver/config.go b/receiver/elasticsearchreceiver/config.go index 711cd4aed6d7..06c71ea112cf 100644 --- a/receiver/elasticsearchreceiver/config.go +++ b/receiver/elasticsearchreceiver/config.go @@ -29,8 +29,8 @@ var ( // Config is the configuration for the elasticsearch receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `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 42c9bc1d215e..d28be30fcad5 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { SkipClusterMetrics: true, Nodes: []string{"_local"}, Indices: []string{".geoip_databases"}, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 413a30da4e6d..2a432d0756b0 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -32,11 +32,11 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default elasticsearchreceiver config. func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultHTTPClientTimeout, @@ -68,7 +68,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &c.ScraperControllerSettings, + &c.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index ee8fc46c997d..ceccf75f9756 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -78,21 +78,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index b18792508133..8670b95423e1 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -256,8 +256,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 74cad46a4440..6fc74abc73f5 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -211,8 +211,8 @@ func TestScraperFailedStart(t *testing.T) { conf.ClientConfig = confighttp.ClientConfig{ Endpoint: "localhost:9200", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index 81ad5ba1a0bd..0718a5aa49f1 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -15,9 +15,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 098e59b0606f..8f47e81be257 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "custom"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, Timeout: time.Second * 5, diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index 1334ad0d1dc8..0568d1c3dbd7 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -48,7 +48,7 @@ func newMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper), @@ -57,7 +57,7 @@ func newMetricsReceiver( func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultTimeout, diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index 4a12afc07b8d..d4ffcb9be2fb 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, ClientConfig: confighttp.ClientConfig{ diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index c015425216af..caf0210d1230 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,16 +49,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 55692aed9ba6..765decb76527 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -159,8 +161,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 75311452f229..8c9ec61d688b 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -30,6 +30,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -47,22 +48,22 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index c0f693a1c308..18570d8593b1 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,12 +166,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/filelogreceiver/storage_test.go b/receiver/filelogreceiver/storage_test.go index d46ef7625ac6..d705809407d5 100644 --- a/receiver/filelogreceiver/storage_test.go +++ b/receiver/filelogreceiver/storage_test.go @@ -41,7 +41,8 @@ func TestStorage(t *testing.T) { ext := storagetest.NewFileBackedStorageExtension("test", storageDir) host := storagetest.NewStorageHost().WithExtension(ext.ID, ext) sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) + set := receivertest.NewNopCreateSettings() + rcvr, err := f.CreateLogsReceiver(ctx, set, cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) @@ -72,7 +73,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) - rcvr, err = f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, set, cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() @@ -117,7 +118,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) - rcvr, err = f.CreateLogsReceiver(ctx, receivertest.NewNopCreateSettings(), cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, set, cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() diff --git a/receiver/filestatsreceiver/config.go b/receiver/filestatsreceiver/config.go index a8feb423cf7e..2eb6ae7decf7 100644 --- a/receiver/filestatsreceiver/config.go +++ b/receiver/filestatsreceiver/config.go @@ -12,9 +12,9 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Include string `mapstructure:"include"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Include string `mapstructure:"include"` } func (c Config) Validate() error { diff --git a/receiver/filestatsreceiver/config_test.go b/receiver/filestatsreceiver/config_test.go index 5ced691b87bf..03b0771c3c8c 100644 --- a/receiver/filestatsreceiver/config_test.go +++ b/receiver/filestatsreceiver/config_test.go @@ -9,8 +9,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata" ) func Test_Config_Validate(t *testing.T) { @@ -22,16 +20,16 @@ func Test_Config_Validate(t *testing.T) { { name: "valid", cfg: &Config{ - Include: "/var/log/*.log", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Include: "/var/log/*.log", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, wantErr: nil, }, { name: "missing include pattern", cfg: &Config{ - Include: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Include: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, wantErr: errors.New("include must not be empty"), }, diff --git a/receiver/filestatsreceiver/factory.go b/receiver/filestatsreceiver/factory.go index db397268fa9b..5c4293b1bc8e 100644 --- a/receiver/filestatsreceiver/factory.go +++ b/receiver/filestatsreceiver/factory.go @@ -24,8 +24,8 @@ func NewFactory() receiver.Factory { func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -45,7 +45,7 @@ func newReceiver( opt := scraperhelper.AddScraper(s) return scraperhelper.NewScraperControllerReceiver( - &fileStatsConfig.ScraperControllerSettings, + &fileStatsConfig.ControllerConfig, settings, consumer, opt, diff --git a/receiver/filestatsreceiver/go.mod b/receiver/filestatsreceiver/go.mod index a6129c462731..380adeca7468 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -90,7 +90,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/filestatsreceiver/go.sum b/receiver/filestatsreceiver/go.sum index 7c7f46c4ef3f..7b2d194a3997 100644 --- a/receiver/filestatsreceiver/go.sum +++ b/receiver/filestatsreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,22 +142,22 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -205,7 +205,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -226,8 +225,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/filestatsreceiver/integration_test.go b/receiver/filestatsreceiver/integration_test.go index 821483afa4b6..a9069dbde579 100644 --- a/receiver/filestatsreceiver/integration_test.go +++ b/receiver/filestatsreceiver/integration_test.go @@ -6,10 +6,13 @@ package filestatsreceiver import ( + "os" "path/filepath" + "strings" "testing" "time" + "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/scraperinttest" @@ -18,17 +21,24 @@ import ( func Test_Integration(t *testing.T) { expectedFile := filepath.Join("testdata", "integration", "expected.yaml") - + tempDir := t.TempDir() + require.NoError(t, os.WriteFile(filepath.Join(tempDir, "foo.txt"), []byte("foo"), 0600)) + require.NoError(t, os.WriteFile(filepath.Join(tempDir, "bar.txt"), []byte("bar"), 0600)) + require.NoError(t, os.WriteFile(filepath.Join(tempDir, "foobar.txt"), []byte("foobar"), 0600)) scraperinttest.NewIntegrationTest( NewFactory(), scraperinttest.WithCustomConfig( func(_ *testing.T, cfg component.Config, _ *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) rCfg.CollectionInterval = time.Second - rCfg.Include = "filestats_*" + rCfg.Include = filepath.Join(tempDir, "foo*") + rCfg.ResourceAttributes.FilePath.Enabled = true }), scraperinttest.WithExpectedFile(expectedFile), scraperinttest.WithCompareOptions( + pmetrictest.ChangeResourceAttributeValue("file.path", func(s string) string { + return strings.TrimPrefix(s, tempDir) + }), pmetrictest.IgnoreResourceMetricsOrder(), pmetrictest.IgnoreMetricValues(), pmetrictest.IgnoreMetricDataPointsOrder(), diff --git a/receiver/filestatsreceiver/scraper.go b/receiver/filestatsreceiver/scraper.go index 5e09b5891947..67807f3f655f 100644 --- a/receiver/filestatsreceiver/scraper.go +++ b/receiver/filestatsreceiver/scraper.go @@ -6,7 +6,6 @@ package filestatsreceiver // import "github.com/open-telemetry/opentelemetry-col import ( "context" "os" - "path/filepath" "time" "github.com/bmatcuk/doublestar/v4" @@ -42,18 +41,13 @@ func (s *scraper) scrape(_ context.Context) (pmetric.Metrics, error) { scrapeErrors = append(scrapeErrors, err) continue } - path, err := filepath.Abs(fileinfo.Name()) - if err != nil { - scrapeErrors = append(scrapeErrors, err) - continue - } s.mb.RecordFileSizeDataPoint(now, fileinfo.Size()) s.mb.RecordFileMtimeDataPoint(now, fileinfo.ModTime().Unix()) collectStats(now, fileinfo, s.mb, s.logger) rb := s.mb.NewResourceBuilder() rb.SetFileName(fileinfo.Name()) - rb.SetFilePath(path) + rb.SetFilePath(match) s.mb.EmitForResource(metadata.WithResource(rb.Emit())) } diff --git a/receiver/filestatsreceiver/testdata/integration/expected.yaml b/receiver/filestatsreceiver/testdata/integration/expected.yaml index a54b368539a7..5e4e76b92a37 100644 --- a/receiver/filestatsreceiver/testdata/integration/expected.yaml +++ b/receiver/filestatsreceiver/testdata/integration/expected.yaml @@ -3,34 +3,10 @@ resourceMetrics: attributes: - key: file.name value: - stringValue: filestats_darwin.go - scopeMetrics: - - metrics: - - description: Elapsed time since the last modification of the file or folder, in seconds since Epoch. - name: file.mtime - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "1703319421" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: s - - description: The size of the file or folder, in bytes. - gauge: - dataPoints: - - asInt: "882" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: file.size - unit: b - scope: - name: otelcol/filestatsreceiver - version: latest - - resource: - attributes: - - key: file.name + stringValue: foo.txt + - key: file.path value: - stringValue: filestats_linux.go + stringValue: /foo.txt scopeMetrics: - metrics: - description: Elapsed time since the last modification of the file or folder, in seconds since Epoch. @@ -38,14 +14,14 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "1703319421" + - asInt: "1710390874" startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: s - description: The size of the file or folder, in bytes. gauge: dataPoints: - - asInt: "845" + - asInt: "3" startTimeUnixNano: "1000000" timeUnixNano: "2000000" name: file.size @@ -57,34 +33,10 @@ resourceMetrics: attributes: - key: file.name value: - stringValue: filestats_other.go - scopeMetrics: - - metrics: - - description: Elapsed time since the last modification of the file or folder, in seconds since Epoch. - name: file.mtime - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "1703319421" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: s - - description: The size of the file or folder, in bytes. - gauge: - dataPoints: - - asInt: "776" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: file.size - unit: b - scope: - name: otelcol/filestatsreceiver - version: latest - - resource: - attributes: - - key: file.name + stringValue: foobar.txt + - key: file.path value: - stringValue: filestats_windows.go + stringValue: /foobar.txt scopeMetrics: - metrics: - description: Elapsed time since the last modification of the file or folder, in seconds since Epoch. @@ -92,14 +44,14 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "1703319421" + - asInt: "1710390874" startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: s - description: The size of the file or folder, in bytes. gauge: dataPoints: - - asInt: "901" + - asInt: "6" startTimeUnixNano: "1000000" timeUnixNano: "2000000" name: file.size diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index 8cb23c2c4c1f..86fcfcbc4b35 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -60,8 +60,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -76,7 +76,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/flinkmetricsreceiver/config.go b/receiver/flinkmetricsreceiver/config.go index d53245e1a70f..721214338064 100644 --- a/receiver/flinkmetricsreceiver/config.go +++ b/receiver/flinkmetricsreceiver/config.go @@ -17,9 +17,9 @@ 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.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 706acf2f6e56..c7b271630edb 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: fmt.Errorf("\"endpoint\" must be in the form of ://:: %w", errors.New(`parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`)), }, @@ -41,7 +41,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index e5d3a8de66fb..b49ec0c71ae5 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -29,11 +29,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -59,7 +59,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 69fa78b8becc..eaadc8312291 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 5fc68f05ad26..2717fdc219b2 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -32,6 +32,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 1dbb8dfdc08f..9697de4b59e2 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index ab02aa118d98..fb45281a8a48 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -44,8 +44,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -60,7 +60,7 @@ func TestScraperStart(t *testing.T) { scraper: &flinkmetricsScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 099ec3aaaf0d..da543427e143 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/stretchr/testify v1.9.0 github.com/tinylib/msgp v1.1.9 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( 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.6.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 @@ -43,8 +44,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -54,7 +55,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 563e0a9a137f..0024e927398f 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -51,6 +51,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -104,20 +106,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -196,8 +198,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/gitproviderreceiver/config.go b/receiver/gitproviderreceiver/config.go index 32bfda5ace0f..af62305613ca 100644 --- a/receiver/gitproviderreceiver/config.go +++ b/receiver/gitproviderreceiver/config.go @@ -21,9 +21,9 @@ const ( // Config that is exposed to this github receiver through the OTEL config.yaml type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Scrapers map[string]internal.Config `mapstructure:"scrapers"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Scrapers map[string]internal.Config `mapstructure:"scrapers"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/receiver/gitproviderreceiver/config_test.go b/receiver/gitproviderreceiver/config_test.go index 09bed60e9551..748f783feb9f 100644 --- a/receiver/gitproviderreceiver/config_test.go +++ b/receiver/gitproviderreceiver/config_test.go @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers[component.NewIDWithName(metadata.Type, "customname")].(*Config) expectedConfig := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: 1 * time.Second, }, @@ -79,9 +79,9 @@ func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) { func TestConfig_Unmarshal(t *testing.T) { type fields struct { - ScraperControllerSettings scraperhelper.ScraperControllerSettings - Scrapers map[string]internal.Config - MetricsBuilderConfig metadata.MetricsBuilderConfig + ControllerConfig scraperhelper.ControllerConfig + Scrapers map[string]internal.Config + MetricsBuilderConfig metadata.MetricsBuilderConfig } type args struct { @@ -104,9 +104,9 @@ func TestConfig_Unmarshal(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: test.fields.ScraperControllerSettings, - Scrapers: test.fields.Scrapers, - MetricsBuilderConfig: test.fields.MetricsBuilderConfig, + ControllerConfig: test.fields.ControllerConfig, + Scrapers: test.fields.Scrapers, + MetricsBuilderConfig: test.fields.MetricsBuilderConfig, } if err := cfg.Unmarshal(test.args.componentParser); (err != nil) != test.wantErr { t.Errorf("Config.Unmarshal() error = %v, wantErr %v", err, test.wantErr) diff --git a/receiver/gitproviderreceiver/factory.go b/receiver/gitproviderreceiver/factory.go index 33d849131286..0abf15c6115a 100644 --- a/receiver/gitproviderreceiver/factory.go +++ b/receiver/gitproviderreceiver/factory.go @@ -49,7 +49,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { // Create the default config based on the const(s) defined above. func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), // TODO: metrics builder configuration may need to be in each sub scraper, // TODO: for right now setting here because the metrics in this receiver will apply to all // TODO: scrapers defined as a common set of gitprovider @@ -80,7 +80,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &conf.ScraperControllerSettings, + &conf.ControllerConfig, params, consumer, addScraperOpts..., diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index 3a5662640237..9f31ac7f61ab 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -3,18 +3,18 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/gitpro go 1.21 require ( - github.com/Khan/genqlient v0.6.0 + github.com/Khan/genqlient v0.7.0 github.com/google/go-cmp v0.6.0 github.com/google/go-github/v59 v59.0.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -58,35 +58,35 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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/vektah/gqlparser/v2 v2.5.11 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect @@ -110,7 +110,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 916b88e1c090..57426f8f08fd 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -1,7 +1,7 @@ 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/Khan/genqlient v0.6.0 h1:Bwb1170ekuNIVIwTJEqvO8y7RxBxXu639VJOkKSrwAk= -github.com/Khan/genqlient v0.6.0/go.mod h1:rvChwWVTqXhiapdhLDV4bp9tz/Xvtewwkon4DpWWCRM= +github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= +github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -128,8 +128,8 @@ github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -156,72 +156,72 @@ github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnA 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= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -302,7 +302,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -339,8 +339,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/generated_graphql.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/generated_graphql.go index 1e9df97678dc..5739f5743189 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/generated_graphql.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/generated_graphql.go @@ -871,29 +871,29 @@ query checkLogin ($login: String!) { ` func checkLogin( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, login string, ) (*checkLoginResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "checkLogin", Query: checkLogin_Operation, Variables: &__checkLoginInput{ Login: login, }, } - var err error + var err_ error - var data checkLoginResponse - resp := &graphql.Response{Data: &data} + var data_ checkLoginResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by getBranchData. @@ -925,15 +925,15 @@ query getBranchData ($name: String!, $owner: String!, $branchFirst: Int!, $targe ` func getBranchData( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, name string, owner string, branchFirst int, targetBranch string, branchCursor *string, ) (*getBranchDataResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "getBranchData", Query: getBranchData_Operation, Variables: &__getBranchDataInput{ @@ -944,18 +944,18 @@ func getBranchData( BranchCursor: branchCursor, }, } - var err error + var err_ error - var data getBranchDataResponse - resp := &graphql.Response{Data: &data} + var data_ getBranchDataResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by getPullRequestData. @@ -997,15 +997,15 @@ query getPullRequestData ($name: String!, $owner: String!, $prFirst: Int!, $prCu ` func getPullRequestData( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, name string, owner string, prFirst int, prCursor *string, prStates []PullRequestState, ) (*getPullRequestDataResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "getPullRequestData", Query: getPullRequestData_Operation, Variables: &__getPullRequestDataInput{ @@ -1016,18 +1016,18 @@ func getPullRequestData( PrStates: prStates, }, } - var err error + var err_ error - var data getPullRequestDataResponse - resp := &graphql.Response{Data: &data} + var data_ getPullRequestDataResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } // The query or mutation executed by getRepoDataBySearch. @@ -1054,12 +1054,12 @@ query getRepoDataBySearch ($searchQuery: String!, $repoCursor: String) { ` func getRepoDataBySearch( - ctx context.Context, - client graphql.Client, + ctx_ context.Context, + client_ graphql.Client, searchQuery string, repoCursor *string, ) (*getRepoDataBySearchResponse, error) { - req := &graphql.Request{ + req_ := &graphql.Request{ OpName: "getRepoDataBySearch", Query: getRepoDataBySearch_Operation, Variables: &__getRepoDataBySearchInput{ @@ -1067,16 +1067,16 @@ func getRepoDataBySearch( RepoCursor: repoCursor, }, } - var err error + var err_ error - var data getRepoDataBySearchResponse - resp := &graphql.Response{Data: &data} + var data_ getRepoDataBySearchResponse + resp_ := &graphql.Response{Data: &data_} - err = client.MakeRequest( - ctx, - req, - resp, + err_ = client_.MakeRequest( + ctx_, + req_, + resp_, ) - return &data, err + return &data_, err_ } diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 2c005a94e206..c2e4d024d7d6 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -71,9 +71,6 @@ func (factory *pubsubReceiverFactory) CreateTracesReceiver( cfg component.Config, consumer consumer.Traces) (receiver.Traces, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForTrace() if err != nil { return nil, err @@ -92,9 +89,6 @@ func (factory *pubsubReceiverFactory) CreateMetricsReceiver( cfg component.Config, consumer consumer.Metrics) (receiver.Metrics, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForMetric() if err != nil { return nil, err @@ -113,9 +107,6 @@ func (factory *pubsubReceiverFactory) CreateLogsReceiver( cfg component.Config, consumer consumer.Logs) (receiver.Logs, error) { - if consumer == nil { - return nil, component.ErrNilNextConsumer - } err := cfg.(*Config).validateForLog() if err != nil { return nil, err diff --git a/receiver/googlecloudpubsubreceiver/factory_test.go b/receiver/googlecloudpubsubreceiver/factory_test.go index 88838e0b145e..1d942b159ef6 100644 --- a/receiver/googlecloudpubsubreceiver/factory_test.go +++ b/receiver/googlecloudpubsubreceiver/factory_test.go @@ -36,8 +36,6 @@ func TestCreateTracesReceiver(t *testing.T) { tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "traces receiver creation failed") - _, err = factory.CreateTracesReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestCreateMetricsReceiver(t *testing.T) { @@ -49,8 +47,6 @@ func TestCreateMetricsReceiver(t *testing.T) { tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "metrics receiver creation failed") - _, err = factory.CreateMetricsReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestCreateLogsReceiver(t *testing.T) { @@ -62,8 +58,6 @@ func TestCreateLogsReceiver(t *testing.T) { tReceiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "logs receiver creation failed") - _, err = factory.CreateLogsReceiver(context.Background(), params, cfg, nil) - assert.Error(t, err) } func TestEnsureReceiver(t *testing.T) { diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 41053d7cba42..8284d5c94b65 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -9,20 +9,20 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.166.0 + google.golang.org/api v0.170.0 google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 ) @@ -44,8 +44,9 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.1 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -60,25 +61,25 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index a41a763b1660..d41e9a71e517 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -23,8 +23,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -32,8 +30,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -80,8 +76,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= -github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -136,30 +132,30 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -182,8 +178,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -202,11 +198,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -248,8 +244,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.166.0 h1:6m4NUwrZYhAaVIHZWxaKjw1L1vNAjtMwORmKRyEEo24= -google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -261,15 +257,15 @@ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c h1:9g7erC9qu44ks7UK4gDNlnk4kOxZG707xKm4jVniy6o= google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/googlecloudspannerreceiver/config.go b/receiver/googlecloudspannerreceiver/config.go index c80d0b849e76..ae88f0b00c9c 100644 --- a/receiver/googlecloudspannerreceiver/config.go +++ b/receiver/googlecloudspannerreceiver/config.go @@ -16,7 +16,7 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` TopMetricsQueryMaxRows int `mapstructure:"top_metrics_query_max_rows"` BackfillEnabled bool `mapstructure:"backfill_enabled"` diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index 95478964bfc3..0dd720f8f8cd 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 120 * time.Second, InitialDelay: time.Second, }, @@ -177,7 +177,7 @@ func TestValidateConfig(t *testing.T) { for name, testCase := range testCases { t.Run(name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: testCase.collectionInterval, }, TopMetricsQueryMaxRows: testCase.topMetricsQueryMaxRows, diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index 76ad73ffcb70..a2674d47eb19 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -32,7 +32,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), TopMetricsQueryMaxRows: defaultTopMetricsQueryMaxRows, BackfillEnabled: defaultBackfillEnabled, HideTopnLockstatsRowrangestartkey: defaultHideTopnLockstatsRowrangestartkey, @@ -56,6 +56,6 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&rCfg.ScraperControllerSettings, settings, consumer, + return scraperhelper.NewScraperControllerReceiver(&rCfg.ControllerConfig, settings, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 8859b800142e..e1e2e923715d 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -3,28 +3,28 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/google go 1.21 require ( - cloud.google.com/go/spanner v1.57.0 + cloud.google.com/go/spanner v1.60.0 github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.165.0 - google.golang.org/grpc v1.62.0 + google.golang.org/api v0.170.0 + google.golang.org/grpc v1.62.1 gopkg.in/yaml.v3 v3.0.1 ) require ( - cloud.google.com/go v0.112.0 // indirect - cloud.google.com/go/compute v1.23.3 // indirect + cloud.google.com/go v0.112.1 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/longrunning v0.5.5 // indirect @@ -42,10 +42,11 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // 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/protobuf v1.5.4 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // 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 @@ -61,26 +62,26 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // 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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 1e88d16f0b58..5fe2efeb8ec0 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -1,16 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= -cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= +cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= +cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= -cloud.google.com/go/spanner v1.57.0 h1:fJq+ZfQUDHE+cy1li0bJA8+sy2oiSGhuGqN5nqVaZdU= -cloud.google.com/go/spanner v1.57.0/go.mod h1:aXQ5QDdhPRIqVhYmnkAdwPYvj/DRN0FguclhEWw+jOo= +cloud.google.com/go/spanner v1.60.0 h1:O9kf49dfaDRzPpKJNChHUJ+Bao02WPedZb8ZPyi02lI= +cloud.google.com/go/spanner v1.60.0/go.mod h1:D2bOAeT/dC6zsZhXRIxbdYa5nQEYU3wYM/1KN3eg7Fs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= @@ -66,8 +66,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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= @@ -85,8 +85,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= -github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/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= @@ -126,8 +126,8 @@ github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSz github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= 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= @@ -146,24 +146,24 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -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= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -187,8 +187,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -210,11 +210,11 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -232,8 +232,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -262,8 +262,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/api v0.165.0 h1:zd5d4JIIIaYYsfVy1HzoXYZ9rWCSBxxAglbczzo7Bgc= -google.golang.org/api v0.165.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= +google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= +google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= 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= @@ -271,19 +271,19 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ 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-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= -google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 h1:9IZDv+/GcI6u+a4jRFRLxQs0RUCfavGfoOgEW6jpkI0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/haproxyreceiver/config.go b/receiver/haproxyreceiver/config.go index b141ed3ea2f0..ec1636686e3c 100644 --- a/receiver/haproxyreceiver/config.go +++ b/receiver/haproxyreceiver/config.go @@ -13,9 +13,9 @@ import ( ) type Config struct { - confighttp.ClientConfig `mapstructure:",squash"` - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { diff --git a/receiver/haproxyreceiver/factory.go b/receiver/haproxyreceiver/factory.go index fdabd7e2ef5a..46409d4198a1 100644 --- a/receiver/haproxyreceiver/factory.go +++ b/receiver/haproxyreceiver/factory.go @@ -24,8 +24,8 @@ func NewFactory() receiver.Factory { func newDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -43,7 +43,7 @@ func newReceiver( } return scraperhelper.NewScraperControllerReceiver( - &haProxyCfg.ScraperControllerSettings, + &haProxyCfg.ControllerConfig, settings, consumer, scraperhelper.AddScraper(s), diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index a904a42544a5..7b6ae9073fb6 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -76,22 +76,22 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -104,7 +104,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index cb198a185603..4f86baf4e026 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -124,8 +124,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,40 +150,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,7 +233,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -254,8 +254,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/haproxyreceiver/integration_test.go b/receiver/haproxyreceiver/integration_test.go index 3bafa4cb8d5c..e0fdb081579c 100644 --- a/receiver/haproxyreceiver/integration_test.go +++ b/receiver/haproxyreceiver/integration_test.go @@ -38,7 +38,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/stats", ci.Host(t), ci.MappedPort(t, haproxyPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/hostmetricsreceiver/README.md b/receiver/hostmetricsreceiver/README.md index d522eae54ac1..837fbbfd7945 100644 --- a/receiver/hostmetricsreceiver/README.md +++ b/receiver/hostmetricsreceiver/README.md @@ -192,3 +192,18 @@ Currently, the hostmetrics receiver does not set any Resource attributes on the export OTEL_RESOURCE_ATTRIBUTES="service.name=,service.namespace=,service.instance.id=" ``` +## 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. + +### `receiver.hostmetrics.normalizeProcessCPUUtilization` + +When enabled, normalizes the `process.cpu.utilization` metric onto the interval [0-1] by dividing the value by the number of logical processors. With this feature gate disabled, the value of the `process.cpu.utilization` metric may exceed 1. + +For example, if you have 4 logical cores on your system, and a process is occupying 2 logical cores for an entire scrape interval, with this feature gate disabled a `process.cpu.utilization` metric will be emitted with a value of 2. if this feature gate is enabled in the same scenario, the value of the emitted metric will be 0.5. + +The schedule for this feature gate is: +- Introduced in v0.97.0 (March 2024) as `alpha` - disabled by default. +- Moved to `beta` in v0.99.0 (April 2024) - enabled by default. +- Moved to `stable` in v0.101.0 (May 2024) - cannot be disabled. +- Removed three releases after `stable`. diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index a9615f19ef78..cc20564cd0e9 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -21,8 +21,8 @@ const ( // Config defines configuration for HostMetrics receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Scrapers map[string]internal.Config `mapstructure:"-"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Scrapers map[string]internal.Config `mapstructure:"-"` // RootPath is the host's root directory (linux only). RootPath string `mapstructure:"root_path"` } diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index c88fc7fd2262..e5b1f969eaa4 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Receivers[component.NewIDWithName(metadata.Type, "customname")].(*Config) expectedConfig := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index e0df87763485..84d4dfe61cb3 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -59,7 +59,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { - return &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)} + return &Config{ControllerConfig: scraperhelper.NewDefaultControllerConfig()} } // createMetricsReceiver creates a metrics receiver based on provided config. @@ -77,7 +77,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &oCfg.ScraperControllerSettings, + &oCfg.ControllerConfig, set, consumer, addScraperOptions..., diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 7f39254d60f4..80db058f7638 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -8,17 +8,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 - github.com/prometheus/procfs v0.12.0 + github.com/prometheus/procfs v0.13.0 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 github.com/yusufpapurcu/wmi v1.2.4 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -90,20 +91,19 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -127,7 +127,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index f95c63d1a970..9c180ada1a64 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -276,8 +276,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= @@ -332,54 +332,54 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -692,8 +692,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index fa39ed74aadb..1c4e1620aaef 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -25,7 +25,6 @@ import ( conventions "go.opentelemetry.io/collector/semconv/v1.9.0" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/diskscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper" @@ -107,7 +106,7 @@ func TestGatherMetrics_EndToEnd(t *testing.T) { sink := new(consumertest.MetricsSink) cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 100 * time.Millisecond, }, Scrapers: map[string]internal.Config{ @@ -285,7 +284,7 @@ func benchmarkScrapeMetrics(b *testing.B, cfg *Config) { require.NoError(b, err) options = append(options, scraperhelper.WithTickerChannel(tickerCh)) - receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, receivertest.NewNopCreateSettings(), sink, options...) + receiver, err := scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, receivertest.NewNopCreateSettings(), sink, options...) require.NoError(b, err) require.NoError(b, receiver.Start(context.Background(), componenttest.NewNopHost())) @@ -303,8 +302,8 @@ func benchmarkScrapeMetrics(b *testing.B, cfg *Config) { func Benchmark_ScrapeCpuMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -312,8 +311,8 @@ func Benchmark_ScrapeCpuMetrics(b *testing.B) { func Benchmark_ScrapeDiskMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -321,8 +320,8 @@ func Benchmark_ScrapeDiskMetrics(b *testing.B) { func Benchmark_ScrapeFileSystemMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{filesystemscraper.TypeStr: (&filesystemscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{filesystemscraper.TypeStr: (&filesystemscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -330,8 +329,8 @@ func Benchmark_ScrapeFileSystemMetrics(b *testing.B) { func Benchmark_ScrapeLoadMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{loadscraper.TypeStr: (&loadscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{loadscraper.TypeStr: (&loadscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -339,8 +338,8 @@ func Benchmark_ScrapeLoadMetrics(b *testing.B) { func Benchmark_ScrapeMemoryMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{memoryscraper.TypeStr: (&memoryscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{memoryscraper.TypeStr: (&memoryscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -348,8 +347,8 @@ func Benchmark_ScrapeMemoryMetrics(b *testing.B) { func Benchmark_ScrapeNetworkMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{networkscraper.TypeStr: (&networkscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{networkscraper.TypeStr: (&networkscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -357,8 +356,8 @@ func Benchmark_ScrapeNetworkMetrics(b *testing.B) { func Benchmark_ScrapeProcessesMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{processesscraper.TypeStr: (&processesscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{processesscraper.TypeStr: (&processesscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -366,8 +365,8 @@ func Benchmark_ScrapeProcessesMetrics(b *testing.B) { func Benchmark_ScrapePagingMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{pagingscraper.TypeStr: (&pagingscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{pagingscraper.TypeStr: (&pagingscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -379,8 +378,8 @@ func Benchmark_ScrapeProcessMetrics(b *testing.B) { } cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Scrapers: map[string]internal.Config{processscraper.TypeStr: (&processscraper.Factory{}).CreateDefaultConfig()}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Scrapers: map[string]internal.Config{processscraper.TypeStr: (&processscraper.Factory{}).CreateDefaultConfig()}, } benchmarkScrapeMetrics(b, cfg) @@ -388,7 +387,7 @@ func Benchmark_ScrapeProcessMetrics(b *testing.B) { func Benchmark_ScrapeSystemMetrics(b *testing.B) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Scrapers: map[string]internal.Config{ cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig(), diskscraper.TypeStr: (&diskscraper.Factory{}).CreateDefaultConfig(), @@ -410,7 +409,7 @@ func Benchmark_ScrapeSystemAndProcessMetrics(b *testing.B) { } cfg := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Scrapers: map[string]internal.Config{ cpuscraper.TypeStr: &cpuscraper.Config{}, diskscraper.TypeStr: &diskscraper.Config{}, diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index 01d897fe6458..88571bc8c604 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -11,6 +11,7 @@ import ( "time" "github.com/shirou/gopsutil/v3/common" + "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/process" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" @@ -48,6 +49,7 @@ type scraper struct { excludeFS filterset.FilterSet scrapeProcessDelay time.Duration ucals map[int32]*ucal.CPUUtilizationCalculator + logicalCores int // for mocking getProcessCreateTime func(p processHandle, ctx context.Context) (int64, error) @@ -84,6 +86,13 @@ func newProcessScraper(settings receiver.CreateSettings, cfg *Config) (*scraper, } } + logicalCores, err := cpu.Counts(true) + if err != nil { + return nil, fmt.Errorf("error getting number of logical cores: %w", err) + } + + scraper.logicalCores = logicalCores + return scraper, nil } @@ -284,7 +293,7 @@ func (s *scraper) scrapeAndAppendCPUTimeMetric(ctx context.Context, now pcommon. s.ucals[pid] = &ucal.CPUUtilizationCalculator{} } - err = s.ucals[pid].CalculateAndRecord(now, times, s.recordCPUUtilization) + err = s.ucals[pid].CalculateAndRecord(now, s.logicalCores, times, s.recordCPUUtilization) return err } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator.go index 7418b7122f1d..32ffd5c11630 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator.go @@ -7,9 +7,18 @@ import ( "time" "github.com/shirou/gopsutil/v3/cpu" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" ) +var normalizeProcessCPUUtilizationFeatureGate = featuregate.GlobalRegistry().MustRegister( + "receiver.hostmetrics.normalizeProcessCPUUtilization", + featuregate.StageAlpha, + featuregate.WithRegisterDescription("When enabled, normalizes the process.cpu.utilization metric onto the interval [0-1] by dividing the value by the number of logical processors."), + featuregate.WithRegisterFromVersion("v0.97.0"), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31368"), +) + // CPUUtilization stores the utilization percents [0-1] for the different cpu states type CPUUtilization struct { User float64 @@ -27,9 +36,9 @@ type CPUUtilizationCalculator struct { // CalculateAndRecord calculates the cpu utilization for the different cpu states comparing previously // stored []cpu.TimesStat and time.Time and current []cpu.TimesStat and current time.Time // If no previous data is stored it will return empty slice of CPUUtilization and no error -func (c *CPUUtilizationCalculator) CalculateAndRecord(now pcommon.Timestamp, currentCPUStats *cpu.TimesStat, recorder func(pcommon.Timestamp, CPUUtilization)) error { +func (c *CPUUtilizationCalculator) CalculateAndRecord(now pcommon.Timestamp, logicalCores int, currentCPUStats *cpu.TimesStat, recorder func(pcommon.Timestamp, CPUUtilization)) error { if c.previousCPUStats != nil { - recorder(now, cpuUtilization(c.previousCPUStats, c.previousReadTime, currentCPUStats, now)) + recorder(now, cpuUtilization(logicalCores, c.previousCPUStats, c.previousReadTime, currentCPUStats, now)) } c.previousCPUStats = currentCPUStats c.previousReadTime = now @@ -38,14 +47,26 @@ func (c *CPUUtilizationCalculator) CalculateAndRecord(now pcommon.Timestamp, cur } // cpuUtilization calculates the difference between 2 cpu.TimesStat using spent time between them -func cpuUtilization(startStats *cpu.TimesStat, startTime pcommon.Timestamp, endStats *cpu.TimesStat, endTime pcommon.Timestamp) CPUUtilization { +func cpuUtilization(logicalCores int, startStats *cpu.TimesStat, startTime pcommon.Timestamp, endStats *cpu.TimesStat, endTime pcommon.Timestamp) CPUUtilization { elapsedTime := time.Duration(endTime - startTime).Seconds() if elapsedTime <= 0 { return CPUUtilization{} } + + userUtilization := (endStats.User - startStats.User) / elapsedTime + systemUtilization := (endStats.System - startStats.System) / elapsedTime + ioWaitUtilization := (endStats.Iowait - startStats.Iowait) / elapsedTime + + if normalizeProcessCPUUtilizationFeatureGate.IsEnabled() && logicalCores > 0 { + // Normalize onto the [0-1] interval by dividing by the number of logical cores + userUtilization /= float64(logicalCores) + systemUtilization /= float64(logicalCores) + ioWaitUtilization /= float64(logicalCores) + } + return CPUUtilization{ - User: (endStats.User - startStats.User) / elapsedTime, - System: (endStats.System - startStats.System) / elapsedTime, - Iowait: (endStats.Iowait - startStats.Iowait) / elapsedTime, + User: userUtilization, + System: systemUtilization, + Iowait: ioWaitUtilization, } } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator_test.go index 89644284001e..6a226ba62d1a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal/cpu_utilization_calculator_test.go @@ -9,6 +9,8 @@ import ( "github.com/shirou/gopsutil/v3/cpu" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" ) @@ -24,14 +26,17 @@ func TestCpuUtilizationCalculator_Calculate(t *testing.T) { t.Parallel() testCases := []struct { name string + logicalCores int currentReadTime pcommon.Timestamp currentCPUStat *cpu.TimesStat previousReadTime pcommon.Timestamp previousCPUStat *cpu.TimesStat expectedUtilization *CPUUtilization + normalize bool }{ { - name: "no previous times", + name: "no previous times", + logicalCores: 1, currentCPUStat: &cpu.TimesStat{ User: 8260.4, }, @@ -39,6 +44,7 @@ func TestCpuUtilizationCalculator_Calculate(t *testing.T) { }, { name: "no delta time should return utilization=0", + logicalCores: 1, previousReadTime: 1640097430772858000, currentReadTime: 1640097430772858000, previousCPUStat: &cpu.TimesStat{ @@ -51,6 +57,71 @@ func TestCpuUtilizationCalculator_Calculate(t *testing.T) { }, { name: "one second time delta", + logicalCores: 1, + previousReadTime: 1640097430772858000, + currentReadTime: 1640097431772858000, + previousCPUStat: &cpu.TimesStat{ + User: 8258.4, + System: 6193.3, + Iowait: 34.201, + }, + currentCPUStat: &cpu.TimesStat{ + User: 8258.5, + System: 6193.6, + Iowait: 34.202, + }, + expectedUtilization: &CPUUtilization{ + User: 0.1, + System: 0.3, + Iowait: 0.001, + }, + }, + { + name: "one second time delta, 2 logical cores, normalized", + logicalCores: 2, + previousReadTime: 1640097430772858000, + currentReadTime: 1640097431772858000, + previousCPUStat: &cpu.TimesStat{ + User: 8258.4, + System: 6193.3, + Iowait: 34.201, + }, + currentCPUStat: &cpu.TimesStat{ + User: 8258.5, + System: 6193.6, + Iowait: 34.202, + }, + expectedUtilization: &CPUUtilization{ + User: 0.05, + System: 0.15, + Iowait: 0.0005, + }, + normalize: true, + }, + { + name: "one second time delta, 2 logical cores, not normalized", + logicalCores: 2, + previousReadTime: 1640097430772858000, + currentReadTime: 1640097431772858000, + previousCPUStat: &cpu.TimesStat{ + User: 8258.4, + System: 6193.3, + Iowait: 34.201, + }, + currentCPUStat: &cpu.TimesStat{ + User: 8258.5, + System: 6193.6, + Iowait: 34.202, + }, + expectedUtilization: &CPUUtilization{ + User: 0.1, + System: 0.3, + Iowait: 0.001, + }, + }, + { + name: "0 logical cores", + logicalCores: 0, previousReadTime: 1640097430772858000, currentReadTime: 1640097431772858000, previousCPUStat: &cpu.TimesStat{ @@ -73,13 +144,13 @@ func TestCpuUtilizationCalculator_Calculate(t *testing.T) { for _, test := range testCases { test := test t.Run(test.name, func(t *testing.T) { - t.Parallel() + setNormalizeProcessCPUUtilizationFeatureGate(t, test.normalize) recorder := inMemoryRecorder{} calculator := CPUUtilizationCalculator{ previousReadTime: test.previousReadTime, previousCPUStats: test.previousCPUStat, } - err := calculator.CalculateAndRecord(test.currentReadTime, test.currentCPUStat, recorder.record) + err := calculator.CalculateAndRecord(test.currentReadTime, test.logicalCores, test.currentCPUStat, recorder.record) assert.NoError(t, err) assert.InDelta(t, test.expectedUtilization.System, recorder.cpuUtilization.System, 0.00001) assert.InDelta(t, test.expectedUtilization.User, recorder.cpuUtilization.User, 0.00001) @@ -108,9 +179,26 @@ func Test_cpuUtilization(t *testing.T) { Iowait: 0.024, } - actualUtilization := cpuUtilization(startStat, startTime, endStat, halfSecondLater) + actualUtilization := cpuUtilization(1, startStat, startTime, endStat, halfSecondLater) assert.InDelta(t, expectedUtilization.User, actualUtilization.User, 0.00001) assert.InDelta(t, expectedUtilization.System, actualUtilization.System, 0.00001) assert.InDelta(t, expectedUtilization.Iowait, actualUtilization.Iowait, 0.00001) } + +func setNormalizeProcessCPUUtilizationFeatureGate(t *testing.T, val bool) { + wasEnabled := normalizeProcessCPUUtilizationFeatureGate.IsEnabled() + err := featuregate.GlobalRegistry().Set( + normalizeProcessCPUUtilizationFeatureGate.ID(), + val, + ) + require.NoError(t, err) + + t.Cleanup(func() { + err := featuregate.GlobalRegistry().Set( + normalizeProcessCPUUtilizationFeatureGate.ID(), + wasEnabled, + ) + require.NoError(t, err) + }) +} diff --git a/receiver/httpcheckreceiver/config.go b/receiver/httpcheckreceiver/config.go index 1da306717bb4..61019aca3515 100644 --- a/receiver/httpcheckreceiver/config.go +++ b/receiver/httpcheckreceiver/config.go @@ -23,9 +23,9 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Targets []*targetConfig `mapstructure:"targets"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Targets []*targetConfig `mapstructure:"targets"` } type targetConfig struct { diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go index 3758afa31ca4..905de862e827 100644 --- a/receiver/httpcheckreceiver/config_test.go +++ b/receiver/httpcheckreceiver/config_test.go @@ -11,8 +11,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -29,7 +27,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingEndpoint, @@ -45,7 +43,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -66,7 +64,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -82,7 +80,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "www.opentelemetry.io/docs": invalid URI for request`), @@ -103,7 +101,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index fae8cbb22655..7f026900bb1a 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -27,13 +27,13 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 60 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Targets: []*targetConfig{}, + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Targets: []*targetConfig{}, } } @@ -49,5 +49,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 149d43dd2733..c34ececd6935 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index f5afa22c3ec3..b85aa6a8d5de 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -50,15 +51,15 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 55692aed9ba6..765decb76527 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -159,8 +161,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index ef0244b98c55..0ceb0df9440e 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -45,8 +45,8 @@ func TestScraperStart(t *testing.T) { { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -65,7 +65,7 @@ func TestScraperStart(t *testing.T) { Targets: []*targetConfig{ { ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: "http://example.com", }, }, diff --git a/receiver/iisreceiver/config.go b/receiver/iisreceiver/config.go index 0783d76408ba..1fda19f16040 100644 --- a/receiver/iisreceiver/config.go +++ b/receiver/iisreceiver/config.go @@ -11,6 +11,6 @@ import ( // Config defines configuration for simple prometheus receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/iisreceiver/factory.go b/receiver/iisreceiver/factory.go index 8d1221dcf309..8f2c033a90a5 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -21,7 +21,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/iisreceiver/factory_test.go b/receiver/iisreceiver/factory_test.go index df9e9eea6b97..2adc27573076 100644 --- a/receiver/iisreceiver/factory_test.go +++ b/receiver/iisreceiver/factory_test.go @@ -24,7 +24,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index 3b730611d722..225a03344cda 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -33,7 +33,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, nextConsumer, + &cfg.ControllerConfig, params, nextConsumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 3849c72fe6da..5ecfaa4b51d6 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -90,7 +90,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index ce34ee734bd2..901bcc3fa296 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -114,8 +114,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -140,22 +140,22 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -203,7 +203,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -224,8 +224,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index c147c6280258..c9b7f51a6ae4 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -56,17 +56,17 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -77,7 +77,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index abd225bc44e2..edc44df348fd 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -118,40 +118,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -205,8 +205,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index c2c019559ef0..97999b6812b1 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ @@ -94,7 +94,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftCompact: &ProtocolUDP{ @@ -111,10 +111,10 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:9876", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, @@ -204,7 +204,7 @@ func TestInvalidConfig(t *testing.T) { cfg.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "1234", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } }, diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 4755cf06653b..0ef2a473cd94 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -76,7 +76,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, ThriftHTTP: &confighttp.ServerConfig{ diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index aba1cb248e5d..92c45a910c10 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -42,7 +42,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() @@ -83,7 +83,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() @@ -100,10 +100,10 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:14250", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -121,8 +121,8 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { cfg.(*Config).Protocols.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index e987e0d3df40..b98c00a0fa0e 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -5,26 +5,27 @@ go 1.21 require ( github.com/apache/thrift v0.19.0 github.com/gorilla/mux v1.8.1 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -40,6 +41,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -55,18 +57,18 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 238ce9db4254..5900ae6bba3b 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= @@ -12,14 +8,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -46,6 +38,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -58,8 +52,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -100,8 +94,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -132,46 +126,46 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -205,8 +199,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -227,12 +219,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index aa1e5673ba41..77e07cfca7ea 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -161,11 +161,9 @@ func TestJaegerHTTP(t *testing.T) { resp, err := http.Get(fmt.Sprintf("http://%s/sampling?service=test", endpoint)) assert.NoError(t, err, "should not have failed to make request") - if resp != nil { - assert.Equal(t, 500, resp.StatusCode, "should have returned 200") - return - } - t.Fail() + assert.NotNil(t, resp) + defer resp.Body.Close() + assert.Equal(t, 500, resp.StatusCode, "should have returned 200") } func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *configuration) { diff --git a/receiver/jaegerreceiver/package_test.go b/receiver/jaegerreceiver/package_test.go new file mode 100644 index 000000000000..79fe99141725 --- /dev/null +++ b/receiver/jaegerreceiver/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package jaegerreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index bcdce678b8ec..ccfcf4eb6f66 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -398,7 +398,7 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er if jr.config.GRPCServerConfig.NetAddr.Endpoint != "" { var err error - jr.grpc, err = jr.config.GRPCServerConfig.ToServer(host, jr.settings.TelemetrySettings) + jr.grpc, err = jr.config.GRPCServerConfig.ToServerContext(ctx, host, jr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err) } diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 60987e7d914c..50de4cb2d787 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -144,7 +144,7 @@ func TestGRPCReception(t *testing.T) { GRPCServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, } @@ -188,8 +188,8 @@ func TestGRPCReception(t *testing.T) { func TestGRPCReceptionWithTLS(t *testing.T) { // prepare - tlsCreds := &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + tlsCreds := &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "server.crt"), KeyFile: filepath.Join("testdata", "server.key"), }, @@ -198,7 +198,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { grpcServerSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TLSSetting: tlsCreds, } @@ -339,7 +339,7 @@ func TestSampling(t *testing.T) { config := &configuration{ GRPCServerConfig: configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }}, } sink := new(consumertest.TracesSink) diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 36da77e79b78..5b5f85cc36b2 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -83,20 +83,20 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -110,7 +110,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 4cd042ab058f..908ecd906ba4 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= @@ -18,8 +14,6 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -39,8 +33,6 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -164,52 +156,52 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -255,8 +247,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -290,15 +280,13 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/jmxreceiver/receiver.go b/receiver/jmxreceiver/receiver.go index 849ca0258fe4..8b405f7c741e 100644 --- a/receiver/jmxreceiver/receiver.go +++ b/receiver/jmxreceiver/receiver.go @@ -148,7 +148,7 @@ func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) { factory := otlpreceiver.NewFactory() config := factory.CreateDefaultConfig().(*otlpreceiver.Config) - config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: "tcp"} + config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP} config.HTTP = nil return factory.CreateMetricsReceiver(context.Background(), jmx.params, config, jmx.nextConsumer) diff --git a/receiver/journaldreceiver/generated_component_test.go b/receiver/journaldreceiver/generated_component_test.go new file mode 100644 index 000000000000..8b3b46add33a --- /dev/null +++ b/receiver/journaldreceiver/generated_component_test.go @@ -0,0 +1,62 @@ +// Code generated by mdatagen. DO NOT EDIT. +//go:build !darwin && !windows + +package journaldreceiver + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" +) + +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: "logs", + createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateLogsReceiver(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/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 6fbca35537fe..47be3c919af4 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -43,11 +44,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,9 +58,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 56224eb2edc2..98847917285a 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,12 +164,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/journaldreceiver/metadata.yaml b/receiver/journaldreceiver/metadata.yaml index 017440df699d..837b0d405760 100644 --- a/receiver/journaldreceiver/metadata.yaml +++ b/receiver/journaldreceiver/metadata.yaml @@ -8,8 +8,5 @@ status: distributions: [contrib, splunk, observiq, sumo] codeowners: active: [sumo-drosiek, djaglowski] + unsupported_platforms: [darwin, windows] -# TODO: Update the receiver to pass the tests -tests: - skip_lifecycle: true - skip_shutdown: true diff --git a/receiver/k8sclusterreceiver/documentation.md b/receiver/k8sclusterreceiver/documentation.md index aac9303e25b5..9c84fb8a62ee 100644 --- a/receiver/k8sclusterreceiver/documentation.md +++ b/receiver/k8sclusterreceiver/documentation.md @@ -428,6 +428,7 @@ Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4 | container.runtime | The container runtime used by Kubernetes Node. | Any Str | false | | container.runtime.version | The version of container runtime used by Kubernetes Node. | Any Str | false | | k8s.container.name | The k8s container name | Any Str | true | +| k8s.container.status.last_terminated_reason | Last terminated reason of a container. | Any Str | false | | k8s.cronjob.name | The k8s CronJob name | Any Str | true | | k8s.cronjob.uid | The k8s CronJob uid. | Any Str | true | | k8s.daemonset.name | The k8s daemonset name. | Any Str | true | diff --git a/receiver/k8sclusterreceiver/e2e_test.go b/receiver/k8sclusterreceiver/e2e_test.go index 6530976d3461..fbe6aac0cd42 100644 --- a/receiver/k8sclusterreceiver/e2e_test.go +++ b/receiver/k8sclusterreceiver/e2e_test.go @@ -20,8 +20,6 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/tools/clientcmd" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -43,9 +41,8 @@ func TestE2E(t *testing.T) { expectedFile := filepath.Join("testdata", "e2e", "expected.yaml") expected, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) - require.NoError(t, err) - dynamicClient, err := dynamic.NewForConfig(kubeConfig) + + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) require.NoError(t, err) metricsConsumer := new(consumertest.MetricsSink) @@ -53,11 +50,11 @@ func TestE2E(t *testing.T) { defer shutdownSink() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, dynamicClient, testID) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "") defer func() { for _, obj := range append(collectorObjs) { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } }() diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 919be88b9a90..bef364de4b94 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -16,24 +16,23 @@ require ( github.com/openshift/api v3.9.0+incompatible github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -54,7 +53,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -84,20 +83,20 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -114,7 +113,7 @@ require ( golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 423b5ac92758..e913c9ed780c 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -316,50 +307,50 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -621,8 +612,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -665,14 +656,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/k8sclusterreceiver/internal/container/containers.go b/receiver/k8sclusterreceiver/internal/container/containers.go index 9879d9ca71a6..368f4c73c410 100644 --- a/receiver/k8sclusterreceiver/internal/container/containers.go +++ b/receiver/k8sclusterreceiver/internal/container/containers.go @@ -60,6 +60,8 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev logger.Debug("unsupported request type", zap.Any("type", k)) } } + + rb := mb.NewResourceBuilder() var containerID string var imageStr string for _, cs := range pod.Status.ContainerStatuses { @@ -68,11 +70,13 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev imageStr = cs.Image mb.RecordK8sContainerRestartsDataPoint(ts, int64(cs.RestartCount)) mb.RecordK8sContainerReadyDataPoint(ts, boolToInt64(cs.Ready)) + if cs.LastTerminationState.Terminated != nil { + rb.SetK8sContainerStatusLastTerminatedReason(cs.LastTerminationState.Terminated.Reason) + } break } } - rb := mb.NewResourceBuilder() rb.SetK8sPodUID(string(pod.UID)) rb.SetK8sPodName(pod.Name) rb.SetK8sNodeName(pod.Spec.NodeName) diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go index 182e9f812853..ee319ab03b8f 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go @@ -229,42 +229,43 @@ func (rac *ResourceAttributeConfig) Unmarshal(parser *confmap.Conf) error { // ResourceAttributesConfig provides config for k8s_cluster resource attributes. type ResourceAttributesConfig struct { - ContainerID ResourceAttributeConfig `mapstructure:"container.id"` - ContainerImageName ResourceAttributeConfig `mapstructure:"container.image.name"` - ContainerImageTag ResourceAttributeConfig `mapstructure:"container.image.tag"` - ContainerRuntime ResourceAttributeConfig `mapstructure:"container.runtime"` - ContainerRuntimeVersion ResourceAttributeConfig `mapstructure:"container.runtime.version"` - K8sContainerName ResourceAttributeConfig `mapstructure:"k8s.container.name"` - K8sCronjobName ResourceAttributeConfig `mapstructure:"k8s.cronjob.name"` - K8sCronjobUID ResourceAttributeConfig `mapstructure:"k8s.cronjob.uid"` - K8sDaemonsetName ResourceAttributeConfig `mapstructure:"k8s.daemonset.name"` - K8sDaemonsetUID ResourceAttributeConfig `mapstructure:"k8s.daemonset.uid"` - K8sDeploymentName ResourceAttributeConfig `mapstructure:"k8s.deployment.name"` - K8sDeploymentUID ResourceAttributeConfig `mapstructure:"k8s.deployment.uid"` - K8sHpaName ResourceAttributeConfig `mapstructure:"k8s.hpa.name"` - K8sHpaUID ResourceAttributeConfig `mapstructure:"k8s.hpa.uid"` - K8sJobName ResourceAttributeConfig `mapstructure:"k8s.job.name"` - K8sJobUID ResourceAttributeConfig `mapstructure:"k8s.job.uid"` - K8sKubeletVersion ResourceAttributeConfig `mapstructure:"k8s.kubelet.version"` - K8sNamespaceName ResourceAttributeConfig `mapstructure:"k8s.namespace.name"` - K8sNamespaceUID ResourceAttributeConfig `mapstructure:"k8s.namespace.uid"` - K8sNodeName ResourceAttributeConfig `mapstructure:"k8s.node.name"` - K8sNodeUID ResourceAttributeConfig `mapstructure:"k8s.node.uid"` - K8sPodName ResourceAttributeConfig `mapstructure:"k8s.pod.name"` - K8sPodQosClass ResourceAttributeConfig `mapstructure:"k8s.pod.qos_class"` - K8sPodUID ResourceAttributeConfig `mapstructure:"k8s.pod.uid"` - K8sReplicasetName ResourceAttributeConfig `mapstructure:"k8s.replicaset.name"` - K8sReplicasetUID ResourceAttributeConfig `mapstructure:"k8s.replicaset.uid"` - K8sReplicationcontrollerName ResourceAttributeConfig `mapstructure:"k8s.replicationcontroller.name"` - K8sReplicationcontrollerUID ResourceAttributeConfig `mapstructure:"k8s.replicationcontroller.uid"` - K8sResourcequotaName ResourceAttributeConfig `mapstructure:"k8s.resourcequota.name"` - K8sResourcequotaUID ResourceAttributeConfig `mapstructure:"k8s.resourcequota.uid"` - K8sStatefulsetName ResourceAttributeConfig `mapstructure:"k8s.statefulset.name"` - K8sStatefulsetUID ResourceAttributeConfig `mapstructure:"k8s.statefulset.uid"` - OpenshiftClusterquotaName ResourceAttributeConfig `mapstructure:"openshift.clusterquota.name"` - OpenshiftClusterquotaUID ResourceAttributeConfig `mapstructure:"openshift.clusterquota.uid"` - OsDescription ResourceAttributeConfig `mapstructure:"os.description"` - OsType ResourceAttributeConfig `mapstructure:"os.type"` + ContainerID ResourceAttributeConfig `mapstructure:"container.id"` + ContainerImageName ResourceAttributeConfig `mapstructure:"container.image.name"` + ContainerImageTag ResourceAttributeConfig `mapstructure:"container.image.tag"` + ContainerRuntime ResourceAttributeConfig `mapstructure:"container.runtime"` + ContainerRuntimeVersion ResourceAttributeConfig `mapstructure:"container.runtime.version"` + K8sContainerName ResourceAttributeConfig `mapstructure:"k8s.container.name"` + K8sContainerStatusLastTerminatedReason ResourceAttributeConfig `mapstructure:"k8s.container.status.last_terminated_reason"` + K8sCronjobName ResourceAttributeConfig `mapstructure:"k8s.cronjob.name"` + K8sCronjobUID ResourceAttributeConfig `mapstructure:"k8s.cronjob.uid"` + K8sDaemonsetName ResourceAttributeConfig `mapstructure:"k8s.daemonset.name"` + K8sDaemonsetUID ResourceAttributeConfig `mapstructure:"k8s.daemonset.uid"` + K8sDeploymentName ResourceAttributeConfig `mapstructure:"k8s.deployment.name"` + K8sDeploymentUID ResourceAttributeConfig `mapstructure:"k8s.deployment.uid"` + K8sHpaName ResourceAttributeConfig `mapstructure:"k8s.hpa.name"` + K8sHpaUID ResourceAttributeConfig `mapstructure:"k8s.hpa.uid"` + K8sJobName ResourceAttributeConfig `mapstructure:"k8s.job.name"` + K8sJobUID ResourceAttributeConfig `mapstructure:"k8s.job.uid"` + K8sKubeletVersion ResourceAttributeConfig `mapstructure:"k8s.kubelet.version"` + K8sNamespaceName ResourceAttributeConfig `mapstructure:"k8s.namespace.name"` + K8sNamespaceUID ResourceAttributeConfig `mapstructure:"k8s.namespace.uid"` + K8sNodeName ResourceAttributeConfig `mapstructure:"k8s.node.name"` + K8sNodeUID ResourceAttributeConfig `mapstructure:"k8s.node.uid"` + K8sPodName ResourceAttributeConfig `mapstructure:"k8s.pod.name"` + K8sPodQosClass ResourceAttributeConfig `mapstructure:"k8s.pod.qos_class"` + K8sPodUID ResourceAttributeConfig `mapstructure:"k8s.pod.uid"` + K8sReplicasetName ResourceAttributeConfig `mapstructure:"k8s.replicaset.name"` + K8sReplicasetUID ResourceAttributeConfig `mapstructure:"k8s.replicaset.uid"` + K8sReplicationcontrollerName ResourceAttributeConfig `mapstructure:"k8s.replicationcontroller.name"` + K8sReplicationcontrollerUID ResourceAttributeConfig `mapstructure:"k8s.replicationcontroller.uid"` + K8sResourcequotaName ResourceAttributeConfig `mapstructure:"k8s.resourcequota.name"` + K8sResourcequotaUID ResourceAttributeConfig `mapstructure:"k8s.resourcequota.uid"` + K8sStatefulsetName ResourceAttributeConfig `mapstructure:"k8s.statefulset.name"` + K8sStatefulsetUID ResourceAttributeConfig `mapstructure:"k8s.statefulset.uid"` + OpenshiftClusterquotaName ResourceAttributeConfig `mapstructure:"openshift.clusterquota.name"` + OpenshiftClusterquotaUID ResourceAttributeConfig `mapstructure:"openshift.clusterquota.uid"` + OsDescription ResourceAttributeConfig `mapstructure:"os.description"` + OsType ResourceAttributeConfig `mapstructure:"os.type"` } func DefaultResourceAttributesConfig() ResourceAttributesConfig { @@ -287,6 +288,9 @@ func DefaultResourceAttributesConfig() ResourceAttributesConfig { K8sContainerName: ResourceAttributeConfig{ Enabled: true, }, + K8sContainerStatusLastTerminatedReason: ResourceAttributeConfig{ + Enabled: false, + }, K8sCronjobName: ResourceAttributeConfig{ Enabled: true, }, diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go index 712cc9048298..d2d781a02929 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go @@ -72,42 +72,43 @@ func TestMetricsBuilderConfig(t *testing.T) { OpenshiftClusterquotaUsed: MetricConfig{Enabled: true}, }, ResourceAttributes: ResourceAttributesConfig{ - ContainerID: ResourceAttributeConfig{Enabled: true}, - ContainerImageName: ResourceAttributeConfig{Enabled: true}, - ContainerImageTag: ResourceAttributeConfig{Enabled: true}, - ContainerRuntime: ResourceAttributeConfig{Enabled: true}, - ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: true}, - K8sContainerName: ResourceAttributeConfig{Enabled: true}, - K8sCronjobName: ResourceAttributeConfig{Enabled: true}, - K8sCronjobUID: ResourceAttributeConfig{Enabled: true}, - K8sDaemonsetName: ResourceAttributeConfig{Enabled: true}, - K8sDaemonsetUID: ResourceAttributeConfig{Enabled: true}, - K8sDeploymentName: ResourceAttributeConfig{Enabled: true}, - K8sDeploymentUID: ResourceAttributeConfig{Enabled: true}, - K8sHpaName: ResourceAttributeConfig{Enabled: true}, - K8sHpaUID: ResourceAttributeConfig{Enabled: true}, - K8sJobName: ResourceAttributeConfig{Enabled: true}, - K8sJobUID: ResourceAttributeConfig{Enabled: true}, - K8sKubeletVersion: ResourceAttributeConfig{Enabled: true}, - K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, - K8sNamespaceUID: ResourceAttributeConfig{Enabled: true}, - K8sNodeName: ResourceAttributeConfig{Enabled: true}, - K8sNodeUID: ResourceAttributeConfig{Enabled: true}, - K8sPodName: ResourceAttributeConfig{Enabled: true}, - K8sPodQosClass: ResourceAttributeConfig{Enabled: true}, - K8sPodUID: ResourceAttributeConfig{Enabled: true}, - K8sReplicasetName: ResourceAttributeConfig{Enabled: true}, - K8sReplicasetUID: ResourceAttributeConfig{Enabled: true}, - K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: true}, - K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: true}, - K8sResourcequotaName: ResourceAttributeConfig{Enabled: true}, - K8sResourcequotaUID: ResourceAttributeConfig{Enabled: true}, - K8sStatefulsetName: ResourceAttributeConfig{Enabled: true}, - K8sStatefulsetUID: ResourceAttributeConfig{Enabled: true}, - OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: true}, - OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: true}, - OsDescription: ResourceAttributeConfig{Enabled: true}, - OsType: ResourceAttributeConfig{Enabled: true}, + ContainerID: ResourceAttributeConfig{Enabled: true}, + ContainerImageName: ResourceAttributeConfig{Enabled: true}, + ContainerImageTag: ResourceAttributeConfig{Enabled: true}, + ContainerRuntime: ResourceAttributeConfig{Enabled: true}, + ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: true}, + K8sContainerName: ResourceAttributeConfig{Enabled: true}, + K8sContainerStatusLastTerminatedReason: ResourceAttributeConfig{Enabled: true}, + K8sCronjobName: ResourceAttributeConfig{Enabled: true}, + K8sCronjobUID: ResourceAttributeConfig{Enabled: true}, + K8sDaemonsetName: ResourceAttributeConfig{Enabled: true}, + K8sDaemonsetUID: ResourceAttributeConfig{Enabled: true}, + K8sDeploymentName: ResourceAttributeConfig{Enabled: true}, + K8sDeploymentUID: ResourceAttributeConfig{Enabled: true}, + K8sHpaName: ResourceAttributeConfig{Enabled: true}, + K8sHpaUID: ResourceAttributeConfig{Enabled: true}, + K8sJobName: ResourceAttributeConfig{Enabled: true}, + K8sJobUID: ResourceAttributeConfig{Enabled: true}, + K8sKubeletVersion: ResourceAttributeConfig{Enabled: true}, + K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, + K8sNamespaceUID: ResourceAttributeConfig{Enabled: true}, + K8sNodeName: ResourceAttributeConfig{Enabled: true}, + K8sNodeUID: ResourceAttributeConfig{Enabled: true}, + K8sPodName: ResourceAttributeConfig{Enabled: true}, + K8sPodQosClass: ResourceAttributeConfig{Enabled: true}, + K8sPodUID: ResourceAttributeConfig{Enabled: true}, + K8sReplicasetName: ResourceAttributeConfig{Enabled: true}, + K8sReplicasetUID: ResourceAttributeConfig{Enabled: true}, + K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: true}, + K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: true}, + K8sResourcequotaName: ResourceAttributeConfig{Enabled: true}, + K8sResourcequotaUID: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: true}, + OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: true}, + OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: true}, + OsDescription: ResourceAttributeConfig{Enabled: true}, + OsType: ResourceAttributeConfig{Enabled: true}, }, }, }, @@ -161,42 +162,43 @@ func TestMetricsBuilderConfig(t *testing.T) { OpenshiftClusterquotaUsed: MetricConfig{Enabled: false}, }, ResourceAttributes: ResourceAttributesConfig{ - ContainerID: ResourceAttributeConfig{Enabled: false}, - ContainerImageName: ResourceAttributeConfig{Enabled: false}, - ContainerImageTag: ResourceAttributeConfig{Enabled: false}, - ContainerRuntime: ResourceAttributeConfig{Enabled: false}, - ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: false}, - K8sContainerName: ResourceAttributeConfig{Enabled: false}, - K8sCronjobName: ResourceAttributeConfig{Enabled: false}, - K8sCronjobUID: ResourceAttributeConfig{Enabled: false}, - K8sDaemonsetName: ResourceAttributeConfig{Enabled: false}, - K8sDaemonsetUID: ResourceAttributeConfig{Enabled: false}, - K8sDeploymentName: ResourceAttributeConfig{Enabled: false}, - K8sDeploymentUID: ResourceAttributeConfig{Enabled: false}, - K8sHpaName: ResourceAttributeConfig{Enabled: false}, - K8sHpaUID: ResourceAttributeConfig{Enabled: false}, - K8sJobName: ResourceAttributeConfig{Enabled: false}, - K8sJobUID: ResourceAttributeConfig{Enabled: false}, - K8sKubeletVersion: ResourceAttributeConfig{Enabled: false}, - K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, - K8sNamespaceUID: ResourceAttributeConfig{Enabled: false}, - K8sNodeName: ResourceAttributeConfig{Enabled: false}, - K8sNodeUID: ResourceAttributeConfig{Enabled: false}, - K8sPodName: ResourceAttributeConfig{Enabled: false}, - K8sPodQosClass: ResourceAttributeConfig{Enabled: false}, - K8sPodUID: ResourceAttributeConfig{Enabled: false}, - K8sReplicasetName: ResourceAttributeConfig{Enabled: false}, - K8sReplicasetUID: ResourceAttributeConfig{Enabled: false}, - K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: false}, - K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: false}, - K8sResourcequotaName: ResourceAttributeConfig{Enabled: false}, - K8sResourcequotaUID: ResourceAttributeConfig{Enabled: false}, - K8sStatefulsetName: ResourceAttributeConfig{Enabled: false}, - K8sStatefulsetUID: ResourceAttributeConfig{Enabled: false}, - OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: false}, - OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: false}, - OsDescription: ResourceAttributeConfig{Enabled: false}, - OsType: ResourceAttributeConfig{Enabled: false}, + ContainerID: ResourceAttributeConfig{Enabled: false}, + ContainerImageName: ResourceAttributeConfig{Enabled: false}, + ContainerImageTag: ResourceAttributeConfig{Enabled: false}, + ContainerRuntime: ResourceAttributeConfig{Enabled: false}, + ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: false}, + K8sContainerName: ResourceAttributeConfig{Enabled: false}, + K8sContainerStatusLastTerminatedReason: ResourceAttributeConfig{Enabled: false}, + K8sCronjobName: ResourceAttributeConfig{Enabled: false}, + K8sCronjobUID: ResourceAttributeConfig{Enabled: false}, + K8sDaemonsetName: ResourceAttributeConfig{Enabled: false}, + K8sDaemonsetUID: ResourceAttributeConfig{Enabled: false}, + K8sDeploymentName: ResourceAttributeConfig{Enabled: false}, + K8sDeploymentUID: ResourceAttributeConfig{Enabled: false}, + K8sHpaName: ResourceAttributeConfig{Enabled: false}, + K8sHpaUID: ResourceAttributeConfig{Enabled: false}, + K8sJobName: ResourceAttributeConfig{Enabled: false}, + K8sJobUID: ResourceAttributeConfig{Enabled: false}, + K8sKubeletVersion: ResourceAttributeConfig{Enabled: false}, + K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, + K8sNamespaceUID: ResourceAttributeConfig{Enabled: false}, + K8sNodeName: ResourceAttributeConfig{Enabled: false}, + K8sNodeUID: ResourceAttributeConfig{Enabled: false}, + K8sPodName: ResourceAttributeConfig{Enabled: false}, + K8sPodQosClass: ResourceAttributeConfig{Enabled: false}, + K8sPodUID: ResourceAttributeConfig{Enabled: false}, + K8sReplicasetName: ResourceAttributeConfig{Enabled: false}, + K8sReplicasetUID: ResourceAttributeConfig{Enabled: false}, + K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: false}, + K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: false}, + K8sResourcequotaName: ResourceAttributeConfig{Enabled: false}, + K8sResourcequotaUID: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: false}, + OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: false}, + OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: false}, + OsDescription: ResourceAttributeConfig{Enabled: false}, + OsType: ResourceAttributeConfig{Enabled: false}, }, }, }, @@ -233,83 +235,85 @@ func TestResourceAttributesConfig(t *testing.T) { { name: "all_set", want: ResourceAttributesConfig{ - ContainerID: ResourceAttributeConfig{Enabled: true}, - ContainerImageName: ResourceAttributeConfig{Enabled: true}, - ContainerImageTag: ResourceAttributeConfig{Enabled: true}, - ContainerRuntime: ResourceAttributeConfig{Enabled: true}, - ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: true}, - K8sContainerName: ResourceAttributeConfig{Enabled: true}, - K8sCronjobName: ResourceAttributeConfig{Enabled: true}, - K8sCronjobUID: ResourceAttributeConfig{Enabled: true}, - K8sDaemonsetName: ResourceAttributeConfig{Enabled: true}, - K8sDaemonsetUID: ResourceAttributeConfig{Enabled: true}, - K8sDeploymentName: ResourceAttributeConfig{Enabled: true}, - K8sDeploymentUID: ResourceAttributeConfig{Enabled: true}, - K8sHpaName: ResourceAttributeConfig{Enabled: true}, - K8sHpaUID: ResourceAttributeConfig{Enabled: true}, - K8sJobName: ResourceAttributeConfig{Enabled: true}, - K8sJobUID: ResourceAttributeConfig{Enabled: true}, - K8sKubeletVersion: ResourceAttributeConfig{Enabled: true}, - K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, - K8sNamespaceUID: ResourceAttributeConfig{Enabled: true}, - K8sNodeName: ResourceAttributeConfig{Enabled: true}, - K8sNodeUID: ResourceAttributeConfig{Enabled: true}, - K8sPodName: ResourceAttributeConfig{Enabled: true}, - K8sPodQosClass: ResourceAttributeConfig{Enabled: true}, - K8sPodUID: ResourceAttributeConfig{Enabled: true}, - K8sReplicasetName: ResourceAttributeConfig{Enabled: true}, - K8sReplicasetUID: ResourceAttributeConfig{Enabled: true}, - K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: true}, - K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: true}, - K8sResourcequotaName: ResourceAttributeConfig{Enabled: true}, - K8sResourcequotaUID: ResourceAttributeConfig{Enabled: true}, - K8sStatefulsetName: ResourceAttributeConfig{Enabled: true}, - K8sStatefulsetUID: ResourceAttributeConfig{Enabled: true}, - OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: true}, - OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: true}, - OsDescription: ResourceAttributeConfig{Enabled: true}, - OsType: ResourceAttributeConfig{Enabled: true}, + ContainerID: ResourceAttributeConfig{Enabled: true}, + ContainerImageName: ResourceAttributeConfig{Enabled: true}, + ContainerImageTag: ResourceAttributeConfig{Enabled: true}, + ContainerRuntime: ResourceAttributeConfig{Enabled: true}, + ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: true}, + K8sContainerName: ResourceAttributeConfig{Enabled: true}, + K8sContainerStatusLastTerminatedReason: ResourceAttributeConfig{Enabled: true}, + K8sCronjobName: ResourceAttributeConfig{Enabled: true}, + K8sCronjobUID: ResourceAttributeConfig{Enabled: true}, + K8sDaemonsetName: ResourceAttributeConfig{Enabled: true}, + K8sDaemonsetUID: ResourceAttributeConfig{Enabled: true}, + K8sDeploymentName: ResourceAttributeConfig{Enabled: true}, + K8sDeploymentUID: ResourceAttributeConfig{Enabled: true}, + K8sHpaName: ResourceAttributeConfig{Enabled: true}, + K8sHpaUID: ResourceAttributeConfig{Enabled: true}, + K8sJobName: ResourceAttributeConfig{Enabled: true}, + K8sJobUID: ResourceAttributeConfig{Enabled: true}, + K8sKubeletVersion: ResourceAttributeConfig{Enabled: true}, + K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, + K8sNamespaceUID: ResourceAttributeConfig{Enabled: true}, + K8sNodeName: ResourceAttributeConfig{Enabled: true}, + K8sNodeUID: ResourceAttributeConfig{Enabled: true}, + K8sPodName: ResourceAttributeConfig{Enabled: true}, + K8sPodQosClass: ResourceAttributeConfig{Enabled: true}, + K8sPodUID: ResourceAttributeConfig{Enabled: true}, + K8sReplicasetName: ResourceAttributeConfig{Enabled: true}, + K8sReplicasetUID: ResourceAttributeConfig{Enabled: true}, + K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: true}, + K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: true}, + K8sResourcequotaName: ResourceAttributeConfig{Enabled: true}, + K8sResourcequotaUID: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: true}, + OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: true}, + OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: true}, + OsDescription: ResourceAttributeConfig{Enabled: true}, + OsType: ResourceAttributeConfig{Enabled: true}, }, }, { name: "none_set", want: ResourceAttributesConfig{ - ContainerID: ResourceAttributeConfig{Enabled: false}, - ContainerImageName: ResourceAttributeConfig{Enabled: false}, - ContainerImageTag: ResourceAttributeConfig{Enabled: false}, - ContainerRuntime: ResourceAttributeConfig{Enabled: false}, - ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: false}, - K8sContainerName: ResourceAttributeConfig{Enabled: false}, - K8sCronjobName: ResourceAttributeConfig{Enabled: false}, - K8sCronjobUID: ResourceAttributeConfig{Enabled: false}, - K8sDaemonsetName: ResourceAttributeConfig{Enabled: false}, - K8sDaemonsetUID: ResourceAttributeConfig{Enabled: false}, - K8sDeploymentName: ResourceAttributeConfig{Enabled: false}, - K8sDeploymentUID: ResourceAttributeConfig{Enabled: false}, - K8sHpaName: ResourceAttributeConfig{Enabled: false}, - K8sHpaUID: ResourceAttributeConfig{Enabled: false}, - K8sJobName: ResourceAttributeConfig{Enabled: false}, - K8sJobUID: ResourceAttributeConfig{Enabled: false}, - K8sKubeletVersion: ResourceAttributeConfig{Enabled: false}, - K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, - K8sNamespaceUID: ResourceAttributeConfig{Enabled: false}, - K8sNodeName: ResourceAttributeConfig{Enabled: false}, - K8sNodeUID: ResourceAttributeConfig{Enabled: false}, - K8sPodName: ResourceAttributeConfig{Enabled: false}, - K8sPodQosClass: ResourceAttributeConfig{Enabled: false}, - K8sPodUID: ResourceAttributeConfig{Enabled: false}, - K8sReplicasetName: ResourceAttributeConfig{Enabled: false}, - K8sReplicasetUID: ResourceAttributeConfig{Enabled: false}, - K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: false}, - K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: false}, - K8sResourcequotaName: ResourceAttributeConfig{Enabled: false}, - K8sResourcequotaUID: ResourceAttributeConfig{Enabled: false}, - K8sStatefulsetName: ResourceAttributeConfig{Enabled: false}, - K8sStatefulsetUID: ResourceAttributeConfig{Enabled: false}, - OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: false}, - OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: false}, - OsDescription: ResourceAttributeConfig{Enabled: false}, - OsType: ResourceAttributeConfig{Enabled: false}, + ContainerID: ResourceAttributeConfig{Enabled: false}, + ContainerImageName: ResourceAttributeConfig{Enabled: false}, + ContainerImageTag: ResourceAttributeConfig{Enabled: false}, + ContainerRuntime: ResourceAttributeConfig{Enabled: false}, + ContainerRuntimeVersion: ResourceAttributeConfig{Enabled: false}, + K8sContainerName: ResourceAttributeConfig{Enabled: false}, + K8sContainerStatusLastTerminatedReason: ResourceAttributeConfig{Enabled: false}, + K8sCronjobName: ResourceAttributeConfig{Enabled: false}, + K8sCronjobUID: ResourceAttributeConfig{Enabled: false}, + K8sDaemonsetName: ResourceAttributeConfig{Enabled: false}, + K8sDaemonsetUID: ResourceAttributeConfig{Enabled: false}, + K8sDeploymentName: ResourceAttributeConfig{Enabled: false}, + K8sDeploymentUID: ResourceAttributeConfig{Enabled: false}, + K8sHpaName: ResourceAttributeConfig{Enabled: false}, + K8sHpaUID: ResourceAttributeConfig{Enabled: false}, + K8sJobName: ResourceAttributeConfig{Enabled: false}, + K8sJobUID: ResourceAttributeConfig{Enabled: false}, + K8sKubeletVersion: ResourceAttributeConfig{Enabled: false}, + K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, + K8sNamespaceUID: ResourceAttributeConfig{Enabled: false}, + K8sNodeName: ResourceAttributeConfig{Enabled: false}, + K8sNodeUID: ResourceAttributeConfig{Enabled: false}, + K8sPodName: ResourceAttributeConfig{Enabled: false}, + K8sPodQosClass: ResourceAttributeConfig{Enabled: false}, + K8sPodUID: ResourceAttributeConfig{Enabled: false}, + K8sReplicasetName: ResourceAttributeConfig{Enabled: false}, + K8sReplicasetUID: ResourceAttributeConfig{Enabled: false}, + K8sReplicationcontrollerName: ResourceAttributeConfig{Enabled: false}, + K8sReplicationcontrollerUID: ResourceAttributeConfig{Enabled: false}, + K8sResourcequotaName: ResourceAttributeConfig{Enabled: false}, + K8sResourcequotaUID: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: false}, + OpenshiftClusterquotaName: ResourceAttributeConfig{Enabled: false}, + OpenshiftClusterquotaUID: ResourceAttributeConfig{Enabled: false}, + OsDescription: ResourceAttributeConfig{Enabled: false}, + OsType: ResourceAttributeConfig{Enabled: false}, }, }, } diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go index e424dccfd551..8e72e4c91d12 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go @@ -236,6 +236,7 @@ func TestMetricsBuilder(t *testing.T) { rb.SetContainerRuntime("container.runtime-val") rb.SetContainerRuntimeVersion("container.runtime.version-val") rb.SetK8sContainerName("k8s.container.name-val") + rb.SetK8sContainerStatusLastTerminatedReason("k8s.container.status.last_terminated_reason-val") rb.SetK8sCronjobName("k8s.cronjob.name-val") rb.SetK8sCronjobUID("k8s.cronjob.uid-val") rb.SetK8sDaemonsetName("k8s.daemonset.name-val") diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go index 6f09fd36190a..0a4073e705cd 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go @@ -63,6 +63,13 @@ func (rb *ResourceBuilder) SetK8sContainerName(val string) { } } +// SetK8sContainerStatusLastTerminatedReason sets provided value as "k8s.container.status.last_terminated_reason" attribute. +func (rb *ResourceBuilder) SetK8sContainerStatusLastTerminatedReason(val string) { + if rb.config.K8sContainerStatusLastTerminatedReason.Enabled { + rb.res.Attributes().PutStr("k8s.container.status.last_terminated_reason", val) + } +} + // SetK8sCronjobName sets provided value as "k8s.cronjob.name" attribute. func (rb *ResourceBuilder) SetK8sCronjobName(val string) { if rb.config.K8sCronjobName.Enabled { diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go index 915bf92cd9d6..793aa5a225de 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go +++ b/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go @@ -19,6 +19,7 @@ func TestResourceBuilder(t *testing.T) { rb.SetContainerRuntime("container.runtime-val") rb.SetContainerRuntimeVersion("container.runtime.version-val") rb.SetK8sContainerName("k8s.container.name-val") + rb.SetK8sContainerStatusLastTerminatedReason("k8s.container.status.last_terminated_reason-val") rb.SetK8sCronjobName("k8s.cronjob.name-val") rb.SetK8sCronjobUID("k8s.cronjob.uid-val") rb.SetK8sDaemonsetName("k8s.daemonset.name-val") @@ -57,7 +58,7 @@ func TestResourceBuilder(t *testing.T) { case "default": assert.Equal(t, 30, res.Attributes().Len()) case "all_set": - assert.Equal(t, 36, res.Attributes().Len()) + assert.Equal(t, 37, res.Attributes().Len()) case "none_set": assert.Equal(t, 0, res.Attributes().Len()) return @@ -95,6 +96,11 @@ func TestResourceBuilder(t *testing.T) { if ok { assert.EqualValues(t, "k8s.container.name-val", val.Str()) } + val, ok = res.Attributes().Get("k8s.container.status.last_terminated_reason") + assert.Equal(t, test == "all_set", ok) + if ok { + assert.EqualValues(t, "k8s.container.status.last_terminated_reason-val", val.Str()) + } val, ok = res.Attributes().Get("k8s.cronjob.name") assert.True(t, ok) if ok { diff --git a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml index 942580b5a61d..20c47b09563f 100644 --- a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml +++ b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml @@ -102,6 +102,8 @@ all_set: enabled: true k8s.container.name: enabled: true + k8s.container.status.last_terminated_reason: + enabled: true k8s.cronjob.name: enabled: true k8s.cronjob.uid: @@ -265,6 +267,8 @@ none_set: enabled: false k8s.container.name: enabled: false + k8s.container.status.last_terminated_reason: + enabled: false k8s.cronjob.name: enabled: false k8s.cronjob.uid: diff --git a/receiver/k8sclusterreceiver/internal/pod/pods.go b/receiver/k8sclusterreceiver/internal/pod/pods.go index 5b3c504cda85..14e98071e1ec 100644 --- a/receiver/k8sclusterreceiver/internal/pod/pods.go +++ b/receiver/k8sclusterreceiver/internal/pod/pods.go @@ -50,11 +50,12 @@ func Transform(pod *corev1.Pod) *corev1.Pod { continue } newPod.Status.ContainerStatuses = append(newPod.Status.ContainerStatuses, corev1.ContainerStatus{ - Name: cs.Name, - Image: cs.Image, - ContainerID: cs.ContainerID, - RestartCount: cs.RestartCount, - Ready: cs.Ready, + Name: cs.Name, + Image: cs.Image, + ContainerID: cs.ContainerID, + RestartCount: cs.RestartCount, + Ready: cs.Ready, + LastTerminationState: cs.LastTerminationState, }) } for _, c := range pod.Spec.Containers { diff --git a/receiver/k8sclusterreceiver/internal/pod/pods_test.go b/receiver/k8sclusterreceiver/internal/pod/pods_test.go index e9ec03ab0ef1..b82f66bfbeaa 100644 --- a/receiver/k8sclusterreceiver/internal/pod/pods_test.go +++ b/receiver/k8sclusterreceiver/internal/pod/pods_test.go @@ -69,6 +69,7 @@ func TestPodStatusReasonAndContainerMetricsReportCPUMetrics(t *testing.T) { mbc := metadata.DefaultMetricsBuilderConfig() mbc.Metrics.K8sPodStatusReason.Enabled = true mbc.ResourceAttributes.K8sPodQosClass.Enabled = true + mbc.ResourceAttributes.K8sContainerStatusLastTerminatedReason.Enabled = true ts := pcommon.Timestamp(time.Now().UnixNano()) mb := metadata.NewMetricsBuilder(mbc, receivertest.NewNopCreateSettings()) RecordMetrics(zap.NewNop(), mb, pod, ts) diff --git a/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml b/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml index 2da3f591fcd7..4a4921b895f9 100644 --- a/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml +++ b/receiver/k8sclusterreceiver/internal/pod/testdata/expected_evicted.yaml @@ -48,6 +48,9 @@ resourceMetrics: - key: k8s.container.name value: stringValue: container-name + - key: k8s.container.status.last_terminated_reason + value: + stringValue: Evicted - key: k8s.namespace.name value: stringValue: test-namespace diff --git a/receiver/k8sclusterreceiver/internal/testutils/objects.go b/receiver/k8sclusterreceiver/internal/testutils/objects.go index 228383cd380c..4b8dddd6bc45 100644 --- a/receiver/k8sclusterreceiver/internal/testutils/objects.go +++ b/receiver/k8sclusterreceiver/internal/testutils/objects.go @@ -279,6 +279,11 @@ func NewEvictedTerminatedPodStatusWithContainer(containerName, containerID strin State: corev1.ContainerState{ Terminated: &corev1.ContainerStateTerminated{}, }, + LastTerminationState: corev1.ContainerState{ + Terminated: &corev1.ContainerStateTerminated{ + Reason: "Evicted", + }, + }, }, }, } diff --git a/receiver/k8sclusterreceiver/metadata.yaml b/receiver/k8sclusterreceiver/metadata.yaml index 8d82b6863fd9..ec437fa989cd 100644 --- a/receiver/k8sclusterreceiver/metadata.yaml +++ b/receiver/k8sclusterreceiver/metadata.yaml @@ -193,6 +193,11 @@ resource_attributes: type: string enabled: true + k8s.container.status.last_terminated_reason: + description: Last terminated reason of a container. + type: string + enabled: false + attributes: k8s.namespace.name: description: The k8s namespace name. diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 206a11d2ecc9..d7ffde84c79b 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,18 +5,18 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( @@ -32,7 +32,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -58,8 +58,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -73,7 +73,7 @@ require ( golang.org/x/time v0.4.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 08a029d03258..465bd4b3db8c 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -115,8 +115,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -265,22 +265,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -522,8 +522,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -565,14 +565,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/k8sobjectsreceiver/e2e_test.go b/receiver/k8sobjectsreceiver/e2e_test.go index e27c34acb179..c5df5472f01b 100644 --- a/receiver/k8sobjectsreceiver/e2e_test.go +++ b/receiver/k8sobjectsreceiver/e2e_test.go @@ -21,8 +21,6 @@ import ( "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/tools/clientcmd" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -43,9 +41,7 @@ const ( func TestE2E(t *testing.T) { - kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) - require.NoError(t, err) - dynamicClient, err := dynamic.NewForConfig(kubeConfig) + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) require.NoError(t, err) testID := uuid.NewString()[:8] @@ -62,11 +58,11 @@ func TestE2E(t *testing.T) { }() // startup collector in k8s cluster - collectorObjs := k8stest.CreateCollectorObjects(t, dynamicClient, testID) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "") defer func() { for _, obj := range collectorObjs { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } }() @@ -125,18 +121,18 @@ func TestE2E(t *testing.T) { for _, fileName := range tc.objectFileNames { obj, err := os.ReadFile(filepath.Join(testObjectsDir, fileName)) require.NoErrorf(t, err, "failed to read object file %s", fileName) - newObj, err := k8stest.CreateObject(dynamicClient, obj) + newObj, err := k8stest.CreateObject(k8sClient, obj) require.NoErrorf(t, err, "failed to create k8s object from file %s", fileName) testObjs = append(testObjs, newObj) } if tc.objectAction == createAndDelete { for _, obj := range testObjs { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } } else { defer func() { for _, obj := range testObjs { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } }() } diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 161fa4635ca1..e0b576ee3a3f 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -9,22 +9,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -45,7 +44,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -78,20 +77,20 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -108,12 +107,12 @@ require ( golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index 850c6e463424..68d8f7029de1 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -314,50 +305,50 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -619,8 +610,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -664,14 +655,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index a63e0fc119a6..ab71492e10b3 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -12,7 +12,7 @@ import ( // Config represents user settings for kafkametrics receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The list of kafka brokers (default localhost:9092) Brokers []string `mapstructure:"brokers"` diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 4751b3a9a35b..38a2c45a5ff7 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -29,14 +29,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Brokers: []string{"10.10.10.10:9092"}, - ProtocolVersion: "2.0.0", - TopicMatch: "test_\\w+", - GroupMatch: "test_\\w+", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Brokers: []string{"10.10.10.10:9092"}, + ProtocolVersion: "2.0.0", + TopicMatch: "test_\\w+", + GroupMatch: "test_\\w+", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index fca35d2f4ae4..3efc4ef66a77 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Brokers: []string{defaultBroker}, - GroupMatch: defaultGroupMatch, - TopicMatch: defaultTopicMatch, - ClientID: defaultClientID, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Brokers: []string{defaultBroker}, + GroupMatch: defaultGroupMatch, + TopicMatch: defaultTopicMatch, + ClientID: defaultClientID, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 009668404c73..0c236e563b59 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.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -64,9 +65,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -76,7 +77,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 0614fcb824d4..44124adb1753 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -38,6 +38,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -127,24 +129,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -221,8 +223,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 499beac9d1f5..7c8c8dd3e821 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -66,7 +66,7 @@ var newMetricsReceiver = func( } return scraperhelper.NewScraperControllerReceiver( - &config.ScraperControllerSettings, + &config.ControllerConfig, params, consumer, scraperControllerOptions..., diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 5a8ac97222c6..27564342ad76 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -46,8 +46,8 @@ func TestNewReceiver_invalid_scraper_error(t *testing.T) { func TestNewReceiver_invalid_auth_error(t *testing.T) { c := createDefaultConfig().(*Config) c.Authentication = kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/invalid", }, }, diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index c59f70d92e74..bc0d8d4974d5 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -41,8 +41,8 @@ func TestLoadConfig(t *testing.T) { GroupID: "otel-collector", InitialOffset: "latest", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", @@ -73,8 +73,8 @@ func TestLoadConfig(t *testing.T) { GroupID: "otel-collector", InitialOffset: "earliest", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "ca.pem", CertFile: "cert.pem", KeyFile: "key.pem", diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 392b50d9f8fa..5ab8a2caf3b9 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/IBM/sarama v1.43.0 github.com/apache/thrift v0.19.0 github.com/gogo/protobuf v1.3.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 @@ -17,13 +17,13 @@ require ( github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -45,6 +45,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -67,19 +68,19 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.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.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 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -91,7 +92,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 404f2cf02e41..b1cd89b3dbc5 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -72,6 +72,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -82,8 +84,8 @@ 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/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -137,8 +139,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= 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= @@ -168,32 +170,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -299,8 +301,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index ca4b5f544dc1..25d4dcaa4bca 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -59,8 +59,8 @@ func TestNewTracesReceiver_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, @@ -325,8 +325,8 @@ func TestNewMetricsExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, @@ -580,8 +580,8 @@ func TestNewLogsExporter_err_auth_type(t *testing.T) { c := Config{ ProtocolVersion: "2.0.0", Authentication: kafka.Authentication{ - TLS: &configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/doesnotexist", }, }, diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index e12577b93fe8..2133938cbb92 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -22,7 +22,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` kube.ClientConfig `mapstructure:",squash"` confignet.TCPAddrConfig `mapstructure:",squash"` diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index fe5f055413e1..f588fb56e5bd 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "default"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { APIConfig: k8sconfig.APIConfig{ AuthType: "tls", }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: "/path/to/ca.crt", CertFile: "/path/to/apiserver.crt", KeyFile: "/path/to/apiserver.key", @@ -87,7 +87,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "sa"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -108,7 +108,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metadata"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -132,7 +132,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metric_groups"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 20 * time.Second, InitialDelay: time.Second, }, @@ -152,7 +152,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "metadata_with_k8s_api"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: duration, InitialDelay: time.Second, }, @@ -256,7 +256,7 @@ func TestGetReceiverOptions(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/kubeletstatsreceiver/e2e_test.go b/receiver/kubeletstatsreceiver/e2e_test.go index f8de3d0948a2..9d8c314524e4 100644 --- a/receiver/kubeletstatsreceiver/e2e_test.go +++ b/receiver/kubeletstatsreceiver/e2e_test.go @@ -19,8 +19,6 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" - "k8s.io/client-go/dynamic" - "k8s.io/client-go/tools/clientcmd" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -35,9 +33,8 @@ func TestE2E(t *testing.T) { expectedFile := filepath.Join("testdata", "e2e", "expected.yaml") expected, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) - require.NoError(t, err) - dynamicClient, err := dynamic.NewForConfig(kubeConfig) + + k8sClient, err := k8stest.NewK8sClient(testKubeConfig) require.NoError(t, err) metricsConsumer := new(consumertest.MetricsSink) @@ -45,11 +42,11 @@ func TestE2E(t *testing.T) { defer shutdownSink() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, dynamicClient, testID) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "") defer func() { for _, obj := range append(collectorObjs) { - require.NoErrorf(t, k8stest.DeleteObject(dynamicClient, obj), "failed to delete object %s", obj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) } }() diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index 390220f12011..11131f109f14 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -38,11 +38,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: scs, + ControllerConfig: scs, ClientConfig: kube.ClientConfig{ APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeTLS, @@ -73,7 +73,7 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scrp)) } func restClient(logger *zap.Logger, cfg *Config) (kubelet.RestClient, error) { diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index 1bc8b23ce4ef..24ffa9cf57fa 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -113,7 +113,7 @@ func TestRestClientErr(t *testing.T) { func tlsConfig() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -121,7 +121,7 @@ func tlsConfig() *Config { APIConfig: k8sconfig.APIConfig{ AuthType: "tls", }, - TLSSetting: configtls.TLSSetting{ + Config: configtls.Config{ CAFile: "testdata/testcert.crt", CertFile: "testdata/testcert.crt", KeyFile: "testdata/testkey.key", @@ -178,7 +178,7 @@ func TestCustomUnmarshaller(t *testing.T) { args: args{ componentParser: confmap.New(), intoCfg: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -189,7 +189,7 @@ func TestCustomUnmarshaller(t *testing.T) { "collection_interval": 20 * time.Second, }, result: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 20 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index de970c32226f..2fbb526a4eee 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -11,27 +11,26 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 - k8s.io/kubelet v0.29.2 + k8s.io/api v0.29.3 + k8s.io/apimachinery v0.29.3 + k8s.io/client-go v0.29.3 + k8s.io/kubelet v0.29.3 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -52,7 +51,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -85,18 +84,18 @@ 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -113,7 +112,7 @@ require ( golang.org/x/tools v0.16.1 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 4db2af84d7b5..ea315a8a892a 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -8,15 +8,10 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -54,8 +49,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -76,8 +69,6 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -142,8 +133,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -314,50 +305,50 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -619,8 +610,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -664,14 +655,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -683,8 +674,8 @@ k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= -k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubelet v0.29.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= +k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/receiver/lokireceiver/config_test.go b/receiver/lokireceiver/config_test.go index c8e8eed0286f..181b6e41d749 100644 --- a/receiver/lokireceiver/config_test.go +++ b/receiver/lokireceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:3600", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:4600", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/lokireceiver/factory.go b/receiver/lokireceiver/factory.go index e61cce38e955..2958e568314e 100644 --- a/receiver/lokireceiver/factory.go +++ b/receiver/lokireceiver/factory.go @@ -40,7 +40,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/lokireceiver/factory_test.go b/receiver/lokireceiver/factory_test.go index 4422d93947d1..aba939f46f13 100644 --- a/receiver/lokireceiver/factory_test.go +++ b/receiver/lokireceiver/factory_test.go @@ -28,7 +28,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: defaultGRPCBindEndpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } set := receivertest.NewNopCreateSettings() diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index e866e1c8b203..ff7c52d16bfe 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 // indirect github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -47,6 +47,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -62,21 +63,21 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.50.0 // indirect 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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index 49e5026e5f6c..42aa626badfb 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= @@ -20,16 +16,12 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -114,8 +106,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -132,46 +124,46 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -209,8 +201,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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= @@ -237,8 +229,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/lokireceiver/loki.go b/receiver/lokireceiver/loki.go index 374894fc2ef3..c51810f7357b 100644 --- a/receiver/lokireceiver/loki.go +++ b/receiver/lokireceiver/loki.go @@ -69,10 +69,6 @@ func newLokiReceiver(conf *Config, nextConsumer consumer.Logs, settings receiver return nil, err } - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - if conf.HTTP != nil { r.httpMux = http.NewServeMux() r.httpMux.HandleFunc("/loki/api/v1/push", func(resp http.ResponseWriter, req *http.Request) { @@ -106,7 +102,7 @@ func (r *lokiReceiver) startProtocolsServers(ctx context.Context, host component } if r.conf.GRPC != nil { - r.serverGRPC, err = r.conf.GRPC.ToServer(host, r.settings.TelemetrySettings) + r.serverGRPC, err = r.conf.GRPC.ToServerContext(ctx, host, r.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed create grpc server error: %w", err) } diff --git a/receiver/lokireceiver/loki_test.go b/receiver/lokireceiver/loki_test.go index bb723a8d72e3..50507b86861e 100644 --- a/receiver/lokireceiver/loki_test.go +++ b/receiver/lokireceiver/loki_test.go @@ -91,7 +91,7 @@ func startGRPCServer(t *testing.T) (*grpc.ClientConn, *consumertest.LogsSink) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index 74b58c95a8f2..9c8cb093f7c6 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -11,8 +11,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.AddrConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.AddrConfig `mapstructure:",squash"` // MetricsBuilderConfig allows customizing scraped metrics/attributes representation. metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 9ae794d31fd3..ad0874253c41 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval cfg.Timeout = defaultTimeout return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, AddrConfig: confignet.AddrConfig{ Endpoint: defaultEndpoint, }, @@ -60,7 +60,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index 09087e04fa63..188c843a1f60 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index c860cc894704..afc28431504e 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -71,14 +71,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -91,7 +91,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index a34332be7f86..34ab03913828 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,24 +142,24 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -207,7 +207,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -228,8 +227,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/mongodbatlasreceiver/access_logs_integration_test.go b/receiver/mongodbatlasreceiver/access_logs_integration_test.go index a8f39163136e..d6d798a8dc9d 100644 --- a/receiver/mongodbatlasreceiver/access_logs_integration_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_integration_test.go @@ -23,7 +23,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) func TestAccessLogsIntegration(t *testing.T) { @@ -62,7 +61,7 @@ func TestAccessLogsIntegration(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ diff --git a/receiver/mongodbatlasreceiver/access_logs_test.go b/receiver/mongodbatlasreceiver/access_logs_test.go index eba40bac80c6..0d7a059277f1 100644 --- a/receiver/mongodbatlasreceiver/access_logs_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_test.go @@ -26,7 +26,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) var ( @@ -152,9 +151,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "basic", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -206,9 +205,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "multiple page read all", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -243,9 +242,9 @@ func TestAccessLogsRetrieval(t *testing.T) { name: "multiple page break early based on timestamp", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{ @@ -304,9 +303,9 @@ func TestCheckpointing(t *testing.T) { } config := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Logs: LogConfig{ Enabled: true, Projects: []*LogsProjectConfig{pc}, diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index a1fd7b697885..1aae71729e59 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -63,7 +63,7 @@ type alertsReceiver struct { secret string server *http.Server mode string - tlsSettings *configtls.TLSServerSetting + tlsSettings *configtls.ServerConfig consumer consumer.Logs wg *sync.WaitGroup diff --git a/receiver/mongodbatlasreceiver/alerts_integration_test.go b/receiver/mongodbatlasreceiver/alerts_integration_test.go index b884fd94468f..e5bb9a424742 100644 --- a/receiver/mongodbatlasreceiver/alerts_integration_test.go +++ b/receiver/mongodbatlasreceiver/alerts_integration_test.go @@ -128,8 +128,8 @@ func TestAlertsReceiverTLS(t *testing.T) { Secret: testSecret, Mode: alertModeListen, Endpoint: testAddr, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: filepath.Join("testdata", "alerts", "cert", "server.crt"), KeyFile: filepath.Join("testdata", "alerts", "cert", "server.key"), }, diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 63e03d621b71..149cd7afd9e0 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -33,7 +33,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/model" ) @@ -449,9 +448,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "default", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ @@ -495,9 +494,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "project cluster inclusions", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ @@ -523,9 +522,9 @@ func TestAlertsRetrieval(t *testing.T) { name: "hostname and port missing", config: func() *Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), Alerts: AlertConfig{ Mode: alertModePoll, Projects: []*ProjectConfig{ diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index aebe2cd86935..ce16f22cbd55 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -23,25 +23,25 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - PublicKey string `mapstructure:"public_key"` - PrivateKey configopaque.String `mapstructure:"private_key"` - Granularity string `mapstructure:"granularity"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - Projects []*ProjectConfig `mapstructure:"projects"` - Alerts AlertConfig `mapstructure:"alerts"` - Events *EventsConfig `mapstructure:"events"` - Logs LogConfig `mapstructure:"logs"` - BackOffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` - StorageID *component.ID `mapstructure:"storage"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + PublicKey string `mapstructure:"public_key"` + PrivateKey configopaque.String `mapstructure:"private_key"` + Granularity string `mapstructure:"granularity"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + Projects []*ProjectConfig `mapstructure:"projects"` + Alerts AlertConfig `mapstructure:"alerts"` + Events *EventsConfig `mapstructure:"events"` + Logs LogConfig `mapstructure:"logs"` + BackOffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` + StorageID *component.ID `mapstructure:"storage"` } type AlertConfig struct { - Enabled bool `mapstructure:"enabled"` - Endpoint string `mapstructure:"endpoint"` - Secret configopaque.String `mapstructure:"secret"` - TLS *configtls.TLSServerSetting `mapstructure:"tls"` - Mode string `mapstructure:"mode"` + Enabled bool `mapstructure:"enabled"` + Endpoint string `mapstructure:"endpoint"` + Secret configopaque.String `mapstructure:"secret"` + TLS *configtls.ServerConfig `mapstructure:"tls"` + Mode string `mapstructure:"mode"` // these parameters are only relevant in retrieval mode Projects []*ProjectConfig `mapstructure:"projects"` diff --git a/receiver/mongodbatlasreceiver/config_test.go b/receiver/mongodbatlasreceiver/config_test.go index 183d58290053..a4bbc8f92526 100644 --- a/receiver/mongodbatlasreceiver/config_test.go +++ b/receiver/mongodbatlasreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { name: "Empty config", input: Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -40,7 +40,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -51,7 +51,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoEndpoint.Error(), }, @@ -63,7 +63,7 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoSecret.Error(), }, @@ -76,7 +76,7 @@ func TestValidate(t *testing.T) { Secret: "some_secret", Mode: alertModeListen, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: "failed to split endpoint into 'host:port' pair", }, @@ -88,13 +88,13 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Secret: "some_secret", Mode: alertModeListen, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "some_cert_file", }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoKey.Error(), }, @@ -106,13 +106,13 @@ func TestValidate(t *testing.T) { Endpoint: "0.0.0.0:7706", Secret: "some_secret", Mode: alertModeListen, - TLS: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLS: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ KeyFile: "some_key_file", }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoCert.Error(), }, @@ -124,7 +124,7 @@ func TestValidate(t *testing.T) { Name: "Project1", }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -140,7 +140,7 @@ func TestValidate(t *testing.T) { ExcludeClusters: []string{"Cluster1"}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -153,7 +153,7 @@ func TestValidate(t *testing.T) { ExcludeClusters: []string{"Cluster2"}, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -171,7 +171,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -180,7 +180,7 @@ func TestValidate(t *testing.T) { Logs: LogConfig{ Enabled: true, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoProjects.Error(), }, @@ -200,7 +200,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -219,7 +219,7 @@ func TestValidate(t *testing.T) { }, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, @@ -232,7 +232,7 @@ func TestValidate(t *testing.T) { Projects: []*ProjectConfig{}, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoProjects.Error(), }, @@ -249,7 +249,7 @@ func TestValidate(t *testing.T) { }, PageSize: defaultAlertsPageSize, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -260,7 +260,7 @@ func TestValidate(t *testing.T) { Mode: "invalid type", Projects: []*ProjectConfig{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoModeRecognized.Error(), }, @@ -277,7 +277,7 @@ func TestValidate(t *testing.T) { }, PageSize: -1, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errPageSizeIncorrect.Error(), }, @@ -287,7 +287,7 @@ func TestValidate(t *testing.T) { Events: &EventsConfig{ Projects: []*ProjectConfig{}, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errNoEvents.Error(), }, @@ -308,7 +308,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { @@ -330,7 +330,7 @@ func TestValidate(t *testing.T) { }, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errClusterConfig.Error(), }, diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index ac36ff33ee36..52fdf59e6185 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -47,7 +47,7 @@ func createMetricsReceiver( return nil, fmt.Errorf("unable to create a MongoDB Atlas Scaper instance: %w", err) } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(ms)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(ms)) } func createCombinedLogReceiver( @@ -95,10 +95,10 @@ func createCombinedLogReceiver( func createDefaultConfig() component.Config { c := &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Granularity: defaultGranularity, - BackOffConfig: configretry.NewDefaultBackOffConfig(), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Granularity: defaultGranularity, + BackOffConfig: configretry.NewDefaultBackOffConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), Alerts: AlertConfig{ Enabled: defaultAlertsEnabled, Mode: alertModeListen, @@ -113,6 +113,6 @@ func createDefaultConfig() component.Config { } // reset default of 1 minute to be 3 minutes in order to avoid null values for some metrics that do not publish // more frequently - c.ScraperControllerSettings.CollectionInterval = 3 * time.Minute + c.ControllerConfig.CollectionInterval = 3 * time.Minute return c } diff --git a/receiver/mongodbatlasreceiver/factory_test.go b/receiver/mongodbatlasreceiver/factory_test.go index 7bf3d01c6076..f8f2d52ccf53 100644 --- a/receiver/mongodbatlasreceiver/factory_test.go +++ b/receiver/mongodbatlasreceiver/factory_test.go @@ -29,7 +29,7 @@ func TestBadAlertsReceiver(t *testing.T) { cfg := conf.(*Config) cfg.Alerts.Enabled = true - cfg.Alerts.TLS = &configtls.TLSServerSetting{ + cfg.Alerts.TLS = &configtls.ServerConfig{ ClientCAFile: "/not/a/file", } params := receivertest.NewNopCreateSettings() diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 2325cefdb8c0..14bc0f4c506d 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.96.0 github.com/stretchr/testify v1.9.0 go.mongodb.org/atlas v0.36.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -40,6 +40,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-querystring v1.1.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -60,9 +61,9 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -70,9 +71,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index d29cccea85d9..63b768b1bfa8 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -33,6 +33,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -90,30 +92,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -136,8 +138,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -179,12 +181,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/mongodbatlasreceiver/receiver_test.go b/receiver/mongodbatlasreceiver/receiver_test.go index c592890f3984..9ade727feb20 100644 --- a/receiver/mongodbatlasreceiver/receiver_test.go +++ b/receiver/mongodbatlasreceiver/receiver_test.go @@ -17,7 +17,7 @@ import ( func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - require.Equal(t, cfg.(*Config).ScraperControllerSettings.CollectionInterval, 3*time.Minute) + require.Equal(t, cfg.(*Config).ControllerConfig.CollectionInterval, 3*time.Minute) recv, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, recv, "receiver creation failed") diff --git a/receiver/mongodbreceiver/config.go b/receiver/mongodbreceiver/config.go index 73f6f86e3cf7..38f6f1868b0a 100644 --- a/receiver/mongodbreceiver/config.go +++ b/receiver/mongodbreceiver/config.go @@ -20,8 +20,8 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` Hosts []confignet.AddrConfig `mapstructure:"hosts"` diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index 1d8673c8a676..3bf4fd70c7f5 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -80,15 +80,16 @@ func TestValidate(t *testing.T) { for _, ep := range tc.endpoints { hosts = append(hosts, confignet.AddrConfig{ - Endpoint: ep, + Endpoint: ep, + Transport: confignet.TransportTypeTCP, }) } cfg := &Config{ - Username: tc.username, - Password: configopaque.String(tc.password), - Hosts: hosts, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: tc.username, + Password: configopaque.String(tc.password), + Hosts: hosts, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), } err := component.ValidateConfig(cfg) if tc.expected == nil { @@ -103,13 +104,13 @@ func TestValidate(t *testing.T) { func TestBadTLSConfigs(t *testing.T) { testCases := []struct { desc string - tlsConfig configtls.TLSClientSetting + tlsConfig configtls.ClientConfig expectError bool }{ { desc: "CA file not found", - tlsConfig: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlsConfig: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "not/a/real/file.pem", }, Insecure: false, @@ -120,8 +121,8 @@ func TestBadTLSConfigs(t *testing.T) { }, { desc: "no issues", - tlsConfig: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{}, + tlsConfig: configtls.ClientConfig{ + TLSSetting: configtls.Config{}, Insecure: false, InsecureSkipVerify: false, ServerName: "", @@ -136,11 +137,12 @@ func TestBadTLSConfigs(t *testing.T) { Password: "pword", Hosts: []confignet.AddrConfig{ { - Endpoint: "localhost:27017", + Endpoint: "localhost:27017", + Transport: confignet.TransportTypeTCP, }, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - TLSClientSetting: tc.tlsConfig, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + ClientConfig: tc.tlsConfig, } err := component.ValidateConfig(cfg) if tc.expectError { @@ -184,9 +186,9 @@ func TestOptionsTLS(t *testing.T) { Endpoint: "localhost:27017", }, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: caFile, }, }, diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index 8a730dfde49f..48034feac7de 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -27,15 +27,16 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - Timeout: time.Minute, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + Timeout: time.Minute, Hosts: []confignet.AddrConfig{ { - Endpoint: "localhost:27017", + Endpoint: "localhost:27017", + Transport: confignet.TransportTypeTCP, }, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - TLSClientSetting: configtls.TLSClientSetting{}, + ClientConfig: configtls.ClientConfig{}, } } @@ -56,7 +57,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 6eb20f234a55..e1b778b0b49a 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -34,7 +34,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 0a8f46297095..e3517b33862c 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 go.mongodb.org/mongo-driver v1.14.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -79,7 +79,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -89,9 +89,9 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 5c5cd5a4c24c..b39cfd9e20aa 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -122,8 +122,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -159,32 +159,32 @@ 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= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -243,7 +243,6 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -269,8 +268,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/mysqlreceiver/client.go b/receiver/mysqlreceiver/client.go index 60a838a0458f..6fb000566b1c 100644 --- a/receiver/mysqlreceiver/client.go +++ b/receiver/mysqlreceiver/client.go @@ -180,7 +180,7 @@ func newMySQLClient(conf *Config) (client, error) { driverConf := mysql.Config{ User: conf.Username, Passwd: string(conf.Password), - Net: conf.Transport, + Net: string(conf.Transport), Addr: conf.Endpoint, DBName: conf.Database, AllowNativePasswords: conf.AllowNativePasswords, diff --git a/receiver/mysqlreceiver/config.go b/receiver/mysqlreceiver/config.go index 337891bfee15..a6e6ab6320a8 100644 --- a/receiver/mysqlreceiver/config.go +++ b/receiver/mysqlreceiver/config.go @@ -22,15 +22,15 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Username string `mapstructure:"username,omitempty"` - Password configopaque.String `mapstructure:"password,omitempty"` - Database string `mapstructure:"database,omitempty"` - AllowNativePasswords bool `mapstructure:"allow_native_passwords,omitempty"` - confignet.AddrConfig `mapstructure:",squash"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` - StatementEvents StatementEventsConfig `mapstructure:"statement_events"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Username string `mapstructure:"username,omitempty"` + Password configopaque.String `mapstructure:"password,omitempty"` + Database string `mapstructure:"database,omitempty"` + AllowNativePasswords bool `mapstructure:"allow_native_passwords,omitempty"` + confignet.AddrConfig `mapstructure:",squash"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + StatementEvents StatementEventsConfig `mapstructure:"statement_events"` } type StatementEventsConfig struct { @@ -48,7 +48,7 @@ func (cfg *Config) Unmarshal(componentParser *confmap.Conf) error { // Change the default to Insecure = true as we don't want to break // existing deployments which does not use TLS by default. if !componentParser.IsSet("tls") { - cfg.TLS = configtls.TLSClientSetting{} + cfg.TLS = configtls.ClientConfig{} cfg.TLS.Insecure = true } diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index 57f4a8abad1d..ce40309a2d9d 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -24,15 +24,15 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - AllowNativePasswords: true, - Username: "root", + ControllerConfig: cfg, + AllowNativePasswords: true, + Username: "root", AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:3306", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), StatementEvents: StatementEventsConfig{ @@ -60,7 +60,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index 58641f8ff241..1acab99f3b46 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 2caf70654e6d..3c0b02b3122c 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -3,21 +3,21 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlr go 1.21 require ( - github.com/go-sql-driver/mysql v1.7.1 + github.com/go-sql-driver/mysql v1.8.0 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( require ( dario.cat/mergo v1.0.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect @@ -74,14 +75,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -94,7 +95,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index eda98a394e82..ffdd73d23116 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -1,5 +1,7 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -42,8 +44,8 @@ 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/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -118,8 +120,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -144,28 +146,28 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -213,7 +215,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -234,8 +235,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index 16b9cb4d977e..2990074bb5bf 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -44,11 +45,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,9 +58,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index a278fcdbfa38..9744a767d37e 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,12 +166,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 8bb500012cc7..4a81800a208f 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 40e79c14a07d..db6e036d43cf 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -25,11 +25,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:80/status", Timeout: 10 * time.Second, @@ -53,7 +53,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index 0116dcc781b9..caada4c0d15c 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index d0731a520f3f..c9abd99234ff 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,21 +77,21 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -105,7 +105,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index f634f47ba6c3..a2911c310375 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -126,8 +126,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -152,40 +152,40 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -235,7 +235,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -256,8 +256,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index c87b90023ab1..6ed93f58edc4 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -36,7 +36,7 @@ func TestIntegration(t *testing.T) { scraperinttest.WithCustomConfig( func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { rCfg := cfg.(*Config) - rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond rCfg.Endpoint = fmt.Sprintf("http://%s:%s/status", ci.Host(t), ci.MappedPort(t, nginxPort)) }), scraperinttest.WithCompareOptions( diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 3d4f76110abf..00c391552570 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -85,8 +85,8 @@ func TestScraperFailedStart(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, diff --git a/receiver/nsxtreceiver/config.go b/receiver/nsxtreceiver/config.go index ea2d8bcd9388..a3ad6a685541 100644 --- a/receiver/nsxtreceiver/config.go +++ b/receiver/nsxtreceiver/config.go @@ -18,11 +18,11 @@ import ( // Config is the configuration for the NSX receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.ClientConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate returns if the NSX configuration is valid diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index f03765a819d4..15161f626ed1 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -36,7 +36,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "wss://not-supported-websockets", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("url scheme must be http or https"), }, @@ -46,7 +46,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("parse"), }, @@ -57,7 +57,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("username not provided"), }, @@ -68,7 +68,7 @@ func TestMetricValidation(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedError: errors.New("password not provided"), }, diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index e56f57cdde30..e8e665b8a193 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -28,8 +28,8 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -50,7 +50,7 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index e05020c8da06..18e023702c5a 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 9113b13bb365..1b10ccd57654 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.96.0 github.com/stretchr/testify v1.9.0 github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,15 +53,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -70,7 +71,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 1329ade4a777..74ee56b8dcd4 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -30,6 +30,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -82,38 +84,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -189,8 +191,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 1aa0d91a25c7..e8af7f509968 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:9090", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, }, @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, Keepalive: &configgrpc.KeepaliveServerConfig{ @@ -72,7 +72,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, MaxRecvMsgSizeMiB: 32, MaxConcurrentStreams: 16, @@ -92,11 +92,11 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -110,7 +110,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:55678", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, ReadBufferSize: 512 * 1024, }, @@ -123,7 +123,7 @@ func TestLoadConfig(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "/tmp/opencensus.sock", - Transport: "unix", + Transport: confignet.TransportTypeUnix, }, ReadBufferSize: 512 * 1024, }, diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 8ee917bcdf4e..9e7a34511de4 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(grpcPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, // We almost write 0 bytes, so no need to tune WriteBufferSize. ReadBufferSize: 512 * 1024, @@ -51,7 +51,7 @@ func createTracesReceiver( r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) + recv, err = newOpenCensusReceiver(string(rCfg.NetAddr.Transport), rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) return recv }) if err != nil { @@ -72,7 +72,7 @@ func createMetricsReceiver( r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) + recv, err = newOpenCensusReceiver(string(rCfg.NetAddr.Transport), rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) return recv }) if err != nil { diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index 32b560244339..3fc453c0c048 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -42,7 +42,7 @@ func TestCreateReceiver(t *testing.T) { func TestCreateTracesReceiver(t *testing.T) { defaultNetAddr := confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, } defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, @@ -64,7 +64,7 @@ func TestCreateTracesReceiver(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:112233", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -101,7 +101,7 @@ func TestCreateTracesReceiver(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { defaultNetAddr := confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, } defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, @@ -124,7 +124,7 @@ func TestCreateMetricsReceiver(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 9c69036b50cc..9dffd91aa839 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,26 +12,25 @@ require ( github.com/rs/cors v1.10.1 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.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/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -41,8 +40,9 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // 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/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.2 // indirect @@ -60,16 +60,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 8cf972c18bac..2136a4b145d5 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -1,9 +1,4 @@ -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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= @@ -14,8 +9,6 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -23,8 +16,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -50,9 +41,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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= @@ -61,11 +51,12 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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.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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -127,44 +118,44 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -205,8 +196,6 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -236,8 +225,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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= @@ -252,8 +239,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -263,8 +250,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go index e4d3bc1110aa..a99bf7b865d3 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go @@ -12,7 +12,6 @@ import ( agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receiverhelper" @@ -29,9 +28,6 @@ type Receiver struct { // New creates a new ocmetrics.Receiver reference. func New(nextConsumer consumer.Metrics, set receiver.CreateSettings) (*Receiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, Transport: receiverTransport, diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index f85e5e5a684c..8edf43e86284 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -11,7 +11,6 @@ import ( commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/receiver" @@ -34,9 +33,6 @@ type Receiver struct { // New creates a new opencensus.Receiver reference. func New(nextConsumer consumer.Traces, set receiver.CreateSettings) (*Receiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: set.ID, diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index d89ce069c8f8..7ffb1c004418 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -163,7 +163,7 @@ func (ocr *ocReceiver) grpcServer(host component.Host) (*grpc.Server, error) { if ocr.serverGRPC == nil { var err error - ocr.serverGRPC, err = ocr.grpcServerSettings.ToServer(host, ocr.settings.TelemetrySettings) + ocr.serverGRPC, err = ocr.grpcServerSettings.ToServerContext(context.Background(), host, ocr.settings.TelemetrySettings) if err != nil { return nil, err } diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 1846baae582a..8d2460a5cc0a 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -602,8 +602,8 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { func TestInvalidTLSCredentials(t *testing.T) { cfg := Config{ ServerConfig: configgrpc.ServerConfig{ - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "willfail", }, }, diff --git a/receiver/oracledbreceiver/config.go b/receiver/oracledbreceiver/config.go index 9e87197bc88d..c14cd60beac8 100644 --- a/receiver/oracledbreceiver/config.go +++ b/receiver/oracledbreceiver/config.go @@ -27,13 +27,13 @@ var ( ) type Config struct { - DataSource string `mapstructure:"datasource"` - Endpoint string `mapstructure:"endpoint"` - Password string `mapstructure:"password"` - Service string `mapstructure:"service"` - Username string `mapstructure:"username"` - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + DataSource string `mapstructure:"datasource"` + Endpoint string `mapstructure:"endpoint"` + Password string `mapstructure:"password"` + Service string `mapstructure:"service"` + Username string `mapstructure:"username"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { diff --git a/receiver/oracledbreceiver/config_test.go b/receiver/oracledbreceiver/config_test.go index fd68e70a968e..ba03402451a3 100644 --- a/receiver/oracledbreceiver/config_test.go +++ b/receiver/oracledbreceiver/config_test.go @@ -13,8 +13,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata" ) func TestValidateInvalidConfigs(t *testing.T) { @@ -26,85 +24,85 @@ func TestValidateInvalidConfigs(t *testing.T) { { name: "Empty endpoint", config: &Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyEndpoint, }, { name: "Missing port in endpoint", config: &Config{ - Endpoint: "localhost", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Invalid endpoint format", config: &Config{ - Endpoint: "x;;ef;s;d:::ss:23423423423423423", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "x;;ef;s;d:::ss:23423423423423423", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Missing host in endpoint", config: &Config{ - Endpoint: ":3001", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: ":3001", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadEndpoint, }, { name: "Negative port", config: &Config{ - Endpoint: "localhost:-2", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:-2", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "Bad port", config: &Config{ - Endpoint: "localhost:9999999999999999999", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:9999999999999999999", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadPort, }, { name: "Empty username", config: &Config{ - Endpoint: "localhost:3000", - Username: "", - Password: "secret", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "", + Password: "secret", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyUsername, }, { name: "Empty password", config: &Config{ - Endpoint: "localhost:3000", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyPassword, }, { name: "Empty service", config: &Config{ - Endpoint: "localhost:3000", - Password: "password", - Username: "ro_user", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "localhost:3000", + Password: "password", + Username: "ro_user", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errEmptyService, }, { name: "Invalid data source", config: &Config{ - DataSource: "%%%", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + DataSource: "%%%", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expected: errBadDataSource, }, @@ -120,7 +118,7 @@ func TestValidateInvalidConfigs(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) - assert.Equal(t, 10*time.Second, cfg.ScraperControllerSettings.CollectionInterval) + assert.Equal(t, 10*time.Second, cfg.ControllerConfig.CollectionInterval) } func TestParseConfig(t *testing.T) { diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index 0fce68e160bd..c322f0904019 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -31,12 +31,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -57,7 +57,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr return nil, err } - mp, err := newScraper(metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, func() (*sql.DB, error) { + mp, err := newScraper(metricsBuilder, sqlCfg.MetricsBuilderConfig, sqlCfg.ControllerConfig, settings.TelemetrySettings.Logger, func() (*sql.DB, error) { return sqlOpenerFunc(getDataSource(*sqlCfg)) }, clientProviderFunc, instanceName) if err != nil { @@ -66,7 +66,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr opt := scraperhelper.AddScraper(mp) return scraperhelper.NewScraperControllerReceiver( - &sqlCfg.ScraperControllerSettings, + &sqlCfg.ControllerConfig, settings, consumer, opt, diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 0ae814711d9d..ba0c1363e97e 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/google/go-cmp v0.6.0 - github.com/sijms/go-ora/v2 v2.8.8 + github.com/sijms/go-ora/v2 v2.8.10 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -50,7 +51,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index 977e9369f5d9..0acd9f9a3d9e 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -56,28 +58,28 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/oracledbreceiver/scraper.go b/receiver/oracledbreceiver/scraper.go index 18b9d5aeaa71..9da8f711e657 100644 --- a/receiver/oracledbreceiver/scraper.go +++ b/receiver/oracledbreceiver/scraper.go @@ -59,12 +59,12 @@ type scraper struct { logger *zap.Logger id component.ID instanceName string - scrapeCfg scraperhelper.ScraperControllerSettings + scrapeCfg scraperhelper.ControllerConfig startTime pcommon.Timestamp metricsBuilderConfig metadata.MetricsBuilderConfig } -func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ScraperControllerSettings, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) { +func newScraper(metricsBuilder *metadata.MetricsBuilder, metricsBuilderConfig metadata.MetricsBuilderConfig, scrapeCfg scraperhelper.ControllerConfig, logger *zap.Logger, providerFunc dbProviderFunc, clientProviderFunc clientProviderFunc, instanceName string) (scraperhelper.Scraper, error) { s := &scraper{ mb: metricsBuilder, metricsBuilderConfig: metricsBuilderConfig, diff --git a/receiver/osqueryreceiver/config.go b/receiver/osqueryreceiver/config.go index d6e834992e35..abddbecac074 100644 --- a/receiver/osqueryreceiver/config.go +++ b/receiver/osqueryreceiver/config.go @@ -9,8 +9,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/osqueryreceiver/internal/metadata" ) const ( @@ -18,19 +16,19 @@ const ( ) func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 30 * time.Second return &Config{ - ExtensionsSocket: defaultSocket, - ScraperControllerSettings: scs, + ExtensionsSocket: defaultSocket, + ControllerConfig: scs, } } type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - ExtensionsSocket string `mapstructure:"extensions_socket"` - Queries []string `mapstructure:"queries"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + ExtensionsSocket string `mapstructure:"extensions_socket"` + Queries []string `mapstructure:"queries"` } func (c Config) Validate() error { diff --git a/receiver/osqueryreceiver/factory_test.go b/receiver/osqueryreceiver/factory_test.go index b65a43f7b167..e548ba7e3261 100644 --- a/receiver/osqueryreceiver/factory_test.go +++ b/receiver/osqueryreceiver/factory_test.go @@ -18,5 +18,5 @@ func TestFactory(t *testing.T) { cfg := f.CreateDefaultConfig() assert.NotNil(t, cfg) duration, _ := time.ParseDuration("30s") - assert.Equal(t, duration, cfg.(*Config).ScraperControllerSettings.CollectionInterval) + assert.Equal(t, duration, cfg.(*Config).ControllerConfig.CollectionInterval) } diff --git a/receiver/osqueryreceiver/go.mod b/receiver/osqueryreceiver/go.mod index 756185f42234..c6f57982d57d 100644 --- a/receiver/osqueryreceiver/go.mod +++ b/receiver/osqueryreceiver/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -37,7 +37,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/osqueryreceiver/go.sum b/receiver/osqueryreceiver/go.sum index c515b2edf8be..69e3f2364478 100644 --- a/receiver/osqueryreceiver/go.sum +++ b/receiver/osqueryreceiver/go.sum @@ -20,6 +20,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -61,20 +63,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -126,8 +128,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go index 9e5126987e12..43d8316de8bb 100644 --- a/receiver/otelarrowreceiver/config_test.go +++ b/receiver/otelarrowreceiver/config_test.go @@ -51,10 +51,10 @@ func TestUnmarshalConfig(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:4317", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, @@ -100,7 +100,7 @@ func TestUnmarshalConfigUnix(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "/tmp/grpc_otlp.sock", - Transport: "unix", + Transport: confignet.TransportTypeUnix, }, ReadBufferSize: 512 * 1024, }, @@ -121,5 +121,5 @@ func TestUnmarshalConfigInvalidProtocol(t *testing.T) { func TestUnmarshalConfigNoProtocols(t *testing.T) { cfg := Config{} - assert.NoError(t, component.ValidateConfig(cfg)) + assert.Error(t, component.ValidateConfig(cfg)) } diff --git a/receiver/otelarrowreceiver/factory.go b/receiver/otelarrowreceiver/factory.go index 92a32e48b99e..4e29b3fdf38d 100644 --- a/receiver/otelarrowreceiver/factory.go +++ b/receiver/otelarrowreceiver/factory.go @@ -39,7 +39,7 @@ func createDefaultConfig() component.Config { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: defaultGRPCEndpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, // We almost write 0 bytes, so no need to tune WriteBufferSize. ReadBufferSize: 512 * 1024, @@ -67,9 +67,7 @@ func createTraces( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerTraceConsumer(nextConsumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerTraceConsumer(nextConsumer) return r, nil } @@ -89,9 +87,7 @@ func createMetrics( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerMetricsConsumer(consumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerMetricsConsumer(consumer) return r, nil } @@ -111,9 +107,7 @@ func createLog( return nil, err } - if err = r.Unwrap().(*otelArrowReceiver).registerLogsConsumer(consumer); err != nil { - return nil, err - } + r.Unwrap().(*otelArrowReceiver).registerLogsConsumer(consumer) return r, nil } diff --git a/receiver/otelarrowreceiver/factory_test.go b/receiver/otelarrowreceiver/factory_test.go index 91e41107fe8f..53bf61a4da9e 100644 --- a/receiver/otelarrowreceiver/factory_test.go +++ b/receiver/otelarrowreceiver/factory_test.go @@ -45,7 +45,7 @@ func TestCreateTracesReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -69,7 +69,7 @@ func TestCreateTracesReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:112233", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -101,7 +101,7 @@ func TestCreateMetricReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -125,7 +125,7 @@ func TestCreateMetricReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, @@ -156,7 +156,7 @@ func TestCreateLogReceiver(t *testing.T) { defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } @@ -183,7 +183,7 @@ func TestCreateLogReceiver(t *testing.T) { GRPC: configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "327.0.0.1:1122", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod index 3c837cb495b2..f785f6595ad3 100644 --- a/receiver/otelarrowreceiver/go.mod +++ b/receiver/otelarrowreceiver/go.mod @@ -4,22 +4,22 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 - github.com/open-telemetry/otel-arrow v0.17.0 - github.com/open-telemetry/otel-arrow/collector v0.17.0 + github.com/open-telemetry/otel-arrow v0.18.0 + github.com/open-telemetry/otel-arrow/collector v0.18.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -40,9 +40,10 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.5 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect @@ -60,16 +61,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -80,8 +81,8 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.14.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/otelarrowreceiver/go.sum b/receiver/otelarrowreceiver/go.sum index 9bf53e8c148a..05e9eb530755 100644 --- a/receiver/otelarrowreceiver/go.sum +++ b/receiver/otelarrowreceiver/go.sum @@ -1,7 +1,3 @@ -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= @@ -17,16 +13,12 @@ github.com/brianvoe/gofakeit/v6 v6.17.0 h1:obbQTJeHfktJtiZzq0Q1bEpsNUs+yHrYlPVWt github.com/brianvoe/gofakeit/v6 v6.17.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsYAX0YjD+8suexZDga5CctH4CCTx2+8= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -66,8 +58,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= 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/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= @@ -94,10 +86,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY 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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/open-telemetry/otel-arrow v0.17.0 h1:yYapoRCKGojEUSUZAT5oYEk1xKKIx0hqjhEriLQtlMs= -github.com/open-telemetry/otel-arrow v0.17.0/go.mod h1:XexRufxOt/u17cyweDpw4uESrn/6eAA4CFCLoFdWVLY= -github.com/open-telemetry/otel-arrow/collector v0.17.0 h1:yxgtbK7Tqy/XW0KGa3BSXkImLQlrZcHtjrOwWmrPcNc= -github.com/open-telemetry/otel-arrow/collector v0.17.0/go.mod h1:W+WMolLuMRCR9Us+ZPzNf5oUZb/1M5WRUql0o3sPP5k= +github.com/open-telemetry/otel-arrow v0.18.0 h1:v3KH1HIpdXRy+V5awAmn2M+uthbE52Qi7svBYSweASI= +github.com/open-telemetry/otel-arrow v0.18.0/go.mod h1:054cuTUlLVHH6Y//65bEPeMiHjYRs7DiX/el+yQbgYg= +github.com/open-telemetry/otel-arrow/collector v0.18.0 h1:1YFyQv3pYnU+RxXwhDmr6UeQ+TgOweznBxqc56A5pXQ= +github.com/open-telemetry/otel-arrow/collector v0.18.0/go.mod h1:2ifSqH498f+p/oX3RbR1jl0ej/YA0vyhXI9f8cJvNgo= 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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -125,44 +117,44 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -207,8 +199,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -238,20 +228,18 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/otelarrowreceiver/otelarrow.go b/receiver/otelarrowreceiver/otelarrow.go index 6130f0555288..697c041c7a98 100644 --- a/receiver/otelarrowreceiver/otelarrow.go +++ b/receiver/otelarrowreceiver/otelarrow.go @@ -101,7 +101,7 @@ func (r *otelArrowReceiver) startProtocolServers(host component.Host) error { if r.netReporter != nil { serverOpts = append(serverOpts, grpc.StatsHandler(r.netReporter.Handler())) } - r.serverGRPC, err = r.cfg.GRPC.ToServer(host, r.settings.TelemetrySettings, serverOpts...) + r.serverGRPC, err = r.cfg.GRPC.ToServerContext(context.Background(), host, r.settings.TelemetrySettings, serverOpts...) if err != nil { return err } @@ -170,28 +170,16 @@ func (r *otelArrowReceiver) Shutdown(_ context.Context) error { return err } -func (r *otelArrowReceiver) registerTraceConsumer(tc consumer.Traces) error { - if tc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerTraceConsumer(tc consumer.Traces) { r.tracesReceiver = trace.New(tc, r.obsrepGRPC) - return nil } -func (r *otelArrowReceiver) registerMetricsConsumer(mc consumer.Metrics) error { - if mc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerMetricsConsumer(mc consumer.Metrics) { r.metricsReceiver = metrics.New(mc, r.obsrepGRPC) - return nil } -func (r *otelArrowReceiver) registerLogsConsumer(lc consumer.Logs) error { - if lc == nil { - return component.ErrNilNextConsumer - } +func (r *otelArrowReceiver) registerLogsConsumer(lc consumer.Logs) { r.logsReceiver = logs.New(lc, r.obsrepGRPC) - return nil } var _ arrow.Consumers = &otelArrowReceiver{} diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 6de686b4edb4..8844e477e4b1 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -45,23 +46,23 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index c0f693a1c308..18570d8593b1 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -81,24 +83,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -121,8 +123,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -164,12 +166,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index 43f3364a0923..bf80db303c8c 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -14,7 +14,7 @@ import ( var _ component.Config = (*Config)(nil) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // The URL of the podman server. Default is "unix:///run/podman/podman.sock" Endpoint string `mapstructure:"endpoint"` diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 458d1c7ab8d8..fc415e629ffc 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, Timeout: 5 * time.Second, @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "all"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 2 * time.Second, InitialDelay: time.Second, Timeout: 20 * time.Second, diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 4c9ebaff350e..14dcfde7b9b5 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -27,14 +27,14 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() *Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second cfg.Timeout = 5 * time.Second return &Config{ - ScraperControllerSettings: cfg, - Endpoint: "unix:///run/podman/podman.sock", - APIVersion: defaultAPIVersion, + ControllerConfig: cfg, + Endpoint: "unix:///run/podman/podman.sock", + APIVersion: defaultAPIVersion, } } diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index c871e9312d94..4dcd51e126c2 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/multierr v1.11.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -40,8 +41,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -50,7 +51,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 018c9bb3bdcd..020fc02744c2 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,24 +64,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -135,8 +137,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/podmanreceiver/podman_test.go b/receiver/podmanreceiver/podman_test.go index 9bac08850908..b1e43b838646 100644 --- a/receiver/podmanreceiver/podman_test.go +++ b/receiver/podmanreceiver/podman_test.go @@ -70,7 +70,7 @@ func TestWatchingTimeouts(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ Timeout: 50 * time.Millisecond, }, } @@ -123,7 +123,7 @@ func TestEventLoopHandlesError(t *testing.T) { observed, logs := observer.New(zapcore.WarnLevel) config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ Timeout: 50 * time.Millisecond, }, } diff --git a/receiver/podmanreceiver/receiver.go b/receiver/podmanreceiver/receiver.go index 2fe1685bb271..1a748cfa7fd4 100644 --- a/receiver/podmanreceiver/receiver.go +++ b/receiver/podmanreceiver/receiver.go @@ -55,7 +55,7 @@ func newMetricsReceiver( if err != nil { return nil, err } - return scraperhelper.NewScraperControllerReceiver(&recv.config.ScraperControllerSettings, set, nextConsumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&recv.config.ControllerConfig, set, nextConsumer, scraperhelper.AddScraper(scrp)) } func (r *metricsReceiver) start(ctx context.Context, _ component.Host) error { diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index 531208d72ce6..b516069da111 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -26,7 +26,7 @@ import ( func TestNewReceiver(t *testing.T) { config := &Config{ Endpoint: "unix:///run/some.sock", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 1 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/postgresqlreceiver/client.go b/receiver/postgresqlreceiver/client.go index 977dddd69290..160b943e0cc0 100644 --- a/receiver/postgresqlreceiver/client.go +++ b/receiver/postgresqlreceiver/client.go @@ -70,10 +70,10 @@ type postgreSQLConfig struct { password string database string address confignet.AddrConfig - tls configtls.TLSClientSetting + tls configtls.ClientConfig } -func sslConnectionString(tls configtls.TLSClientSetting) string { +func sslConnectionString(tls configtls.ClientConfig) string { if tls.Insecure { return "sslmode='disable'" } @@ -114,7 +114,7 @@ func (c postgreSQLConfig) ConnectionString() (string, error) { return "", err } - if c.address.Transport == "unix" { + if c.address.Transport == confignet.TransportTypeUnix { // lib/pg expects a unix socket host to start with a "/" and appends the appropriate .s.PGSQL.port internally host = fmt.Sprintf("/%s", host) } diff --git a/receiver/postgresqlreceiver/client_factory.go b/receiver/postgresqlreceiver/client_factory.go index da332a660b70..c940bf2ba723 100644 --- a/receiver/postgresqlreceiver/client_factory.go +++ b/receiver/postgresqlreceiver/client_factory.go @@ -40,7 +40,7 @@ func newDefaultClientFactory(cfg *Config) *defaultClientFactory { username: cfg.Username, password: string(cfg.Password), address: cfg.AddrConfig, - tls: cfg.TLSClientSetting, + tls: cfg.ClientConfig, }, } } @@ -73,7 +73,7 @@ func newPoolClientFactory(cfg *Config) *poolClientFactory { username: cfg.Username, password: string(cfg.Password), address: cfg.AddrConfig, - tls: cfg.TLSClientSetting, + tls: cfg.ClientConfig, }, poolConfig: &poolCfg, pool: make(map[string]*sql.DB), diff --git a/receiver/postgresqlreceiver/config.go b/receiver/postgresqlreceiver/config.go index f5f6160a2a5f..6bd0ba5b817a 100644 --- a/receiver/postgresqlreceiver/config.go +++ b/receiver/postgresqlreceiver/config.go @@ -28,15 +28,15 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - Databases []string `mapstructure:"databases"` - ExcludeDatabases []string `mapstructure:"exclude_databases"` - confignet.AddrConfig `mapstructure:",squash"` // provides Endpoint and Transport - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` // provides SSL details - ConnectionPool `mapstructure:"connection_pool,omitempty"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + Databases []string `mapstructure:"databases"` + ExcludeDatabases []string `mapstructure:"exclude_databases"` + confignet.AddrConfig `mapstructure:",squash"` // provides Endpoint and Transport + configtls.ClientConfig `mapstructure:"tls,omitempty"` // provides SSL details + ConnectionPool `mapstructure:"connection_pool,omitempty"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } type ConnectionPool struct { @@ -67,7 +67,7 @@ func (cfg *Config) Validate() error { } switch cfg.Transport { - case "tcp", "unix": + case confignet.TransportTypeTCP, confignet.TransportTypeUnix: _, _, endpointErr := net.SplitHostPort(cfg.Endpoint) if endpointErr != nil { err = multierr.Append(err, errors.New(ErrHostPort)) diff --git a/receiver/postgresqlreceiver/config_test.go b/receiver/postgresqlreceiver/config_test.go index c6e3a546c26d..d93a92b60d74 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -67,7 +68,7 @@ func TestValidate(t *testing.T) { defaultConfigModifier: func(cfg *Config) { cfg.Username = "otel" cfg.Password = "otel" - cfg.Transport = "teacup" + cfg.Transport = "udp" }, expected: multierr.Combine( errors.New(ErrTransportsSupported), @@ -135,7 +136,7 @@ func TestLoadConfig(t *testing.T) { expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" - expected.AddrConfig.Transport = "tcp" + expected.AddrConfig.Transport = confignet.TransportTypeTCP expected.Username = "otel" expected.Password = "${env:POSTGRESQL_PASSWORD}" expected.ConnectionPool = ConnectionPool{ @@ -153,16 +154,16 @@ func TestLoadConfig(t *testing.T) { expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" - expected.AddrConfig.Transport = "tcp" + expected.AddrConfig.Transport = confignet.TransportTypeTCP expected.Username = "otel" expected.Password = "${env:POSTGRESQL_PASSWORD}" expected.Databases = []string{"otel"} expected.ExcludeDatabases = []string{"template0"} expected.CollectionInterval = 10 * time.Second - expected.TLSClientSetting = configtls.TLSClientSetting{ + expected.ClientConfig = configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "/home/otel/authorities.crt", CertFile: "/home/otel/mypostgrescert.crt", KeyFile: "/home/otel/mypostgreskey.key", diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 4e455fcc1cd9..6bc6a66c41bb 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -25,16 +25,16 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:5432", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: true, }, @@ -64,7 +64,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, consumer, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index 49b454b145b7..585b9a14572d 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -37,7 +37,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 88bf48819158..a68741af9914 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -78,15 +78,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -98,7 +98,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 500a5481936f..680ad7442c90 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -120,8 +120,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -148,30 +148,30 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -240,8 +239,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/prometheusreceiver/README.md b/receiver/prometheusreceiver/README.md index db573d138342..297a14161ebc 100644 --- a/receiver/prometheusreceiver/README.md +++ b/receiver/prometheusreceiver/README.md @@ -141,6 +141,11 @@ receivers: interval: 30s collector_id: collector-1 ``` + +The `target_allocator` section embeds the full [confighttp client configuration][confighttp]. + +[confighttp]: https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp#client-configuration + ## Exemplars This receiver accepts exemplars coming in Prometheus format and converts it to OTLP format. 1. Value is expected to be received in `float64` format diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 05df61dab858..0f61314fc9f1 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -16,6 +16,7 @@ import ( promconfig "github.com/prometheus/prometheus/config" promHTTP "github.com/prometheus/prometheus/discovery/http" "github.com/prometheus/prometheus/discovery/kubernetes" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" "gopkg.in/yaml.v2" ) @@ -52,10 +53,10 @@ func (cfg *Config) Validate() error { } type TargetAllocator struct { - Endpoint string `mapstructure:"endpoint"` - Interval time.Duration `mapstructure:"interval"` - CollectorID string `mapstructure:"collector_id"` - HTTPSDConfig *PromHTTPSDConfig `mapstructure:"http_sd_config"` + confighttp.ClientConfig `mapstructure:",squash"` + Interval time.Duration `mapstructure:"interval"` + CollectorID string `mapstructure:"collector_id"` + HTTPSDConfig *PromHTTPSDConfig `mapstructure:"http_sd_config"` } func (cfg *TargetAllocator) Validate() error { diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index 64d53aca5c2f..81934323c5a7 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -71,8 +71,11 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { r0 := cfg.(*Config) assert.NotNil(t, r0.PrometheusConfig) assert.Equal(t, "http://localhost:8080", r0.TargetAllocator.Endpoint) + assert.Equal(t, 5*time.Second, r0.TargetAllocator.Timeout) + assert.Equal(t, "client.crt", r0.TargetAllocator.TLSSetting.CertFile) assert.Equal(t, 30*time.Second, r0.TargetAllocator.Interval) assert.Equal(t, "collector-1", r0.TargetAllocator.CollectorID) + assert.NotNil(t, r0.PrometheusConfig) sub, err = cm.Sub(component.NewIDWithName(metadata.Type, "withScrape").String()) require.NoError(t, err) diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 376ab0451a53..d801fe9eab4f 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -10,23 +10,25 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 @@ -144,7 +146,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 @@ -156,26 +158,25 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect @@ -198,7 +199,7 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -210,7 +211,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 4947eedf03b2..45082cb5df2b 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -480,8 +480,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -504,8 +504,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= @@ -557,8 +557,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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= @@ -566,70 +566,70 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -767,8 +767,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -842,7 +842,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -990,8 +990,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/prometheusreceiver/metrics_receiver.go b/receiver/prometheusreceiver/metrics_receiver.go index 2a24fd547211..10c754aa2fd7 100644 --- a/receiver/prometheusreceiver/metrics_receiver.go +++ b/receiver/prometheusreceiver/metrics_receiver.go @@ -50,6 +50,7 @@ type pReceiver struct { settings receiver.CreateSettings scrapeManager *scrape.Manager discoveryManager *discovery.Manager + httpClient *http.Client } // New creates a new prometheus.Receiver reference. @@ -66,7 +67,7 @@ func newPrometheusReceiver(set receiver.CreateSettings, cfg *Config, next consum // Start is the method that starts Prometheus scraping. It // is controlled by having previously defined a Configuration using perhaps New. -func (r *pReceiver) Start(_ context.Context, _ component.Host) error { +func (r *pReceiver) Start(_ context.Context, host component.Host) error { discoveryCtx, cancel := context.WithCancel(context.Background()) r.cancelFunc = cancel @@ -89,6 +90,11 @@ func (r *pReceiver) Start(_ context.Context, _ component.Host) error { allocConf := r.cfg.TargetAllocator if allocConf != nil { + r.httpClient, err = r.cfg.TargetAllocator.ToClient(host, r.settings.TelemetrySettings) + if err != nil { + r.settings.Logger.Error("Failed to create http client", zap.Error(err)) + return err + } err = r.startTargetAllocator(allocConf, baseCfg) if err != nil { return err @@ -197,7 +203,7 @@ func (r *pReceiver) getScrapeConfigsResponse(baseURL string) (map[string]*config return nil, err } - resp, err := http.Get(scrapeConfigsURL) //nolint + resp, err := r.httpClient.Get(scrapeConfigsURL) if err != nil { return nil, err } diff --git a/receiver/prometheusreceiver/package_test.go b/receiver/prometheusreceiver/package_test.go new file mode 100644 index 000000000000..7c3be0d8ff21 --- /dev/null +++ b/receiver/prometheusreceiver/package_test.go @@ -0,0 +1,17 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package prometheusreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +// The IgnoreTopFunction call prevents catching the leak generated by opencensus +// defaultWorker.Start which at this time is part of the package's init call. +// See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information. +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")) +} diff --git a/receiver/prometheusreceiver/testdata/config_target_allocator.yaml b/receiver/prometheusreceiver/testdata/config_target_allocator.yaml index 699e3c4e9323..9c708ed58de5 100644 --- a/receiver/prometheusreceiver/testdata/config_target_allocator.yaml +++ b/receiver/prometheusreceiver/testdata/config_target_allocator.yaml @@ -1,6 +1,9 @@ prometheus: target_allocator: endpoint: http://localhost:8080 + timeout: 5s + tls: + cert_file: "client.crt" interval: 30s collector_id: collector-1 prometheus/withScrape: diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 330bc8edd90d..d0725d8311f5 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -6,18 +6,18 @@ require ( github.com/apache/pulsar-client-go v0.8.1 github.com/apache/thrift v0.19.0 github.com/gogo/protobuf v1.3.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -42,10 +42,11 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.6 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect @@ -62,11 +63,11 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect 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.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -75,13 +76,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index e56174b0c8ea..574af8edaf2f 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -240,8 +240,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= @@ -261,8 +261,8 @@ github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNr 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.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -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.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/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= @@ -358,8 +358,8 @@ github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOA github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -420,24 +420,24 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -565,8 +565,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -809,8 +809,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 3c4570f53111..6bf791543138 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -133,16 +133,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -154,7 +154,7 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -165,7 +165,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index f43479ce0d5d..c92e63f84e60 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -479,8 +479,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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= @@ -562,66 +562,66 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -757,8 +757,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -974,8 +974,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 76d1eadf6477..e5bd0aad46a9 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -5,16 +5,16 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -133,16 +133,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -154,7 +154,7 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -165,7 +165,7 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index f43479ce0d5d..c92e63f84e60 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -479,8 +479,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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= @@ -562,66 +562,66 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -757,8 +757,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -974,8 +974,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/rabbitmqreceiver/client_test.go b/receiver/rabbitmqreceiver/client_test.go index f6427bb3a3fe..113b4bbda05f 100644 --- a/receiver/rabbitmqreceiver/client_test.go +++ b/receiver/rabbitmqreceiver/client_test.go @@ -41,8 +41,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -57,7 +57,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/rabbitmqreceiver/config.go b/receiver/rabbitmqreceiver/config.go index d81af2439331..6549234233bf 100644 --- a/receiver/rabbitmqreceiver/config.go +++ b/receiver/rabbitmqreceiver/config.go @@ -11,7 +11,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/receiver/scraperhelper" - "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" ) @@ -28,29 +27,29 @@ 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.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } // Validate validates the configuration by checking for missing or invalid fields func (cfg *Config) Validate() error { - var err error + var err []error if cfg.Username == "" { - err = multierr.Append(err, errMissingUsername) + err = append(err, errMissingUsername) } if cfg.Password == "" { - err = multierr.Append(err, errMissingPassword) + err = append(err, errMissingPassword) } _, parseErr := url.Parse(cfg.Endpoint) if parseErr != nil { wrappedErr := fmt.Errorf("%s: %w", errInvalidEndpoint.Error(), parseErr) - err = multierr.Append(err, wrappedErr) + err = append(err, wrappedErr) } - return err + return errors.Join(err...) } diff --git a/receiver/rabbitmqreceiver/config_test.go b/receiver/rabbitmqreceiver/config_test.go index c914ebc30973..c1e333cbfaf1 100644 --- a/receiver/rabbitmqreceiver/config_test.go +++ b/receiver/rabbitmqreceiver/config_test.go @@ -4,6 +4,7 @@ package rabbitmqreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver" import ( + "errors" "fmt" "path/filepath" "testing" @@ -13,7 +14,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" ) @@ -31,11 +31,10 @@ func TestValidate(t *testing.T) { Endpoint: "invalid://endpoint: 12efg", }, }, - expectedErr: multierr.Combine( + expectedErr: errors.Join( errMissingUsername, errMissingPassword, - fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), - ), + fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`)), }, { desc: "missing password and invalid endpoint", @@ -45,7 +44,7 @@ func TestValidate(t *testing.T) { Endpoint: "invalid://endpoint: 12efg", }, }, - expectedErr: multierr.Combine( + expectedErr: errors.Join( errMissingPassword, fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), ), @@ -58,7 +57,7 @@ func TestValidate(t *testing.T) { Endpoint: "invalid://endpoint: 12efg", }, }, - expectedErr: multierr.Combine( + expectedErr: errors.Join( errMissingUsername, fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), ), @@ -72,7 +71,7 @@ func TestValidate(t *testing.T) { Endpoint: "invalid://endpoint: 12efg", }, }, - expectedErr: multierr.Combine( + expectedErr: errors.Join( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), ), }, diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 51aca22ca36d..13c304d38daa 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -53,5 +53,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index a6bb4b9b315d..f09667afd6cc 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 41d0d4e53158..22bb9d50dad6 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -7,18 +7,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) @@ -34,6 +33,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,24 +52,25 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 1dbb8dfdc08f..9697de4b59e2 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index 527c9d15f53c..bcb64e7e7c56 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -37,8 +37,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -53,7 +53,7 @@ func TestScraperStart(t *testing.T) { scraper: &rabbitmqScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index 26c35128a8e7..1e9aca70aac7 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -66,20 +66,10 @@ func createLogsReceiver( cfg component.Config, consumer consumer.Logs, ) (receiver.Logs, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newLogsReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextLogsConsumer == nil { - rcvr.nextLogsConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextLogsConsumer = consumer return r, nil } @@ -89,20 +79,10 @@ func createMetricsReceiver( cfg component.Config, consumer consumer.Metrics, ) (receiver.Metrics, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newMetricsReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextMetricsConsumer == nil { - rcvr.nextMetricsConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextMetricsConsumer = consumer return r, nil } @@ -112,19 +92,9 @@ func createTracesReceiver( cfg component.Config, consumer consumer.Traces, ) (receiver.Traces, error) { - var err error - var recv receiver.Logs - rCfg := cfg.(*Config) r := receivers.GetOrAdd(cfg, func() component.Component { - recv, err = newTracesReceiverCreator(params, rCfg, consumer) - return recv + return newReceiverCreator(params, cfg.(*Config)) }) - rcvr := r.Component.(*receiverCreator) - if rcvr.nextTracesConsumer == nil { - rcvr.nextTracesConsumer = consumer - } - if err != nil { - return nil, err - } + r.Component.(*receiverCreator).nextTracesConsumer = consumer return r, nil } diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 568bb069a636..e28716d69b6c 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.96.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -56,27 +56,27 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // 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 + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -98,7 +98,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 45f57a413446..00f67ef4f0f6 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -111,8 +111,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -141,58 +141,58 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -271,7 +271,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w 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.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -308,8 +308,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 704efa2608f4..7355c7c341dc 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -27,46 +27,11 @@ type receiverCreator struct { observables []observer.Observable } -// newLogsReceiverCreator creates the receiver_creator with the given parameters. -func newLogsReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Logs) (receiver.Logs, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer +func newReceiverCreator(params receiver.CreateSettings, cfg *Config) receiver.Metrics { + return &receiverCreator{ + params: params, + cfg: cfg, } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextLogsConsumer: nextConsumer, - } - return r, nil -} - -// newMetricsReceiverCreator creates the receiver_creator with the given parameters. -func newMetricsReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Metrics) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextMetricsConsumer: nextConsumer, - } - return r, nil -} - -// newTracesReceiverCreator creates the receiver_creator with the given parameters. -func newTracesReceiverCreator(params receiver.CreateSettings, cfg *Config, nextConsumer consumer.Traces) (receiver.Traces, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - - r := &receiverCreator{ - params: params, - cfg: cfg, - nextTracesConsumer: nextConsumer, - } - return r, nil } // Start receiver_creator. diff --git a/receiver/redisreceiver/config.go b/receiver/redisreceiver/config.go index 7a932efc2aad..e466dd40ff26 100644 --- a/receiver/redisreceiver/config.go +++ b/receiver/redisreceiver/config.go @@ -16,7 +16,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // TODO: Use one of the configs from core. // The target endpoint. confignet.AddrConfig `mapstructure:",squash"` @@ -33,7 +33,7 @@ type Config struct { // to a Redis 6.0 instance, or greater, that is using the Redis ACL system. Password configopaque.String `mapstructure:"password"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index a70ac3c10a6f..0863408bc19d 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -33,14 +33,14 @@ func TestConfig(t *testing.T) { &Config{ AddrConfig: confignet.AddrConfig{ Endpoint: "localhost:6379", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: true, }, Username: "test", Password: "test", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index 495a5837fed5..5500ac844526 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -26,17 +26,17 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ AddrConfig: confignet.AddrConfig{ - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: true, }, - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -53,5 +53,5 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&oCfg.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scrp)) + return scraperhelper.NewScraperControllerReceiver(&oCfg.ControllerConfig, set, consumer, scraperhelper.AddScraper(scrp)) } diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index e985d9368267..b6ee7c78921e 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/redis/go-redis/v9 v9.5.1 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -75,14 +75,14 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -95,7 +95,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index a554240b0abc..c08e1bd68b1a 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -124,8 +124,8 @@ github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLB github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -150,28 +150,28 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -240,8 +239,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/redisreceiver/redis_scraper.go b/receiver/redisreceiver/redis_scraper.go index dc7a9161cd2c..aee7cff55b24 100644 --- a/receiver/redisreceiver/redis_scraper.go +++ b/receiver/redisreceiver/redis_scraper.go @@ -38,7 +38,7 @@ func newRedisScraper(cfg *Config, settings receiver.CreateSettings) (scraperhelp Addr: cfg.Endpoint, Username: cfg.Username, Password: string(cfg.Password), - Network: cfg.Transport, + Network: string(cfg.Transport), } var err error diff --git a/receiver/redisreceiver/redis_scraper_test.go b/receiver/redisreceiver/redis_scraper_test.go index a7da4f803a68..b46a679f74bf 100644 --- a/receiver/redisreceiver/redis_scraper_test.go +++ b/receiver/redisreceiver/redis_scraper_test.go @@ -45,8 +45,8 @@ func TestNewReceiver_invalid_endpoint(t *testing.T) { func TestNewReceiver_invalid_auth_error(t *testing.T) { c := createDefaultConfig().(*Config) - c.TLS = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + c.TLS = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/invalid", }, } diff --git a/receiver/riakreceiver/client_test.go b/receiver/riakreceiver/client_test.go index e9ebe738e6ac..e1b0e57e1c00 100644 --- a/receiver/riakreceiver/client_test.go +++ b/receiver/riakreceiver/client_test.go @@ -37,8 +37,8 @@ func TestNewClient(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -50,7 +50,7 @@ func TestNewClient(t *testing.T) { desc: "Valid Configuration", cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/riakreceiver/config.go b/receiver/riakreceiver/config.go index 24634aca000c..ee6a77f01d8b 100644 --- a/receiver/riakreceiver/config.go +++ b/receiver/riakreceiver/config.go @@ -28,11 +28,11 @@ 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.ClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/riakreceiver/config_test.go b/receiver/riakreceiver/config_test.go index 62ab4082daf5..0874b07b7531 100644 --- a/receiver/riakreceiver/config_test.go +++ b/receiver/riakreceiver/config_test.go @@ -11,8 +11,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" ) func TestValidate(t *testing.T) { @@ -27,7 +25,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -42,7 +40,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingPassword, @@ -56,7 +54,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -71,7 +69,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`), @@ -85,7 +83,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: nil, }, diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index fb12efe5d12f..d51866684361 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -28,11 +28,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, @@ -53,5 +53,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 2ca3de378967..23924dbc4df2 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -36,7 +36,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 25a32599bf34..423f8af9a9c4 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -34,6 +34,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,14 +53,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -69,7 +70,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index 1dbb8dfdc08f..9697de4b59e2 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index 87792b40d345..24d39dd4ce07 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -38,8 +38,8 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "/non/existent", }, }, @@ -55,7 +55,7 @@ func TestScraperStart(t *testing.T) { scraper: &riakScraper{ cfg: &Config{ ClientConfig: confighttp.ClientConfig{ - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: configtls.ClientConfig{}, Endpoint: defaultEndpoint, }, }, diff --git a/receiver/saphanareceiver/client.go b/receiver/saphanareceiver/client.go index 2c725f23e47e..0462fa0d1bfc 100644 --- a/receiver/saphanareceiver/client.go +++ b/receiver/saphanareceiver/client.go @@ -107,7 +107,7 @@ func (c *sapHanaClient) Connect(ctx context.Context) error { return fmt.Errorf("error generating DSN for SAP HANA connection: %w", err) } - tls, err := c.receiverConfig.TLSClientSetting.LoadTLSConfig() + tls, err := c.receiverConfig.ClientConfig.LoadTLSConfig() if err != nil { return fmt.Errorf("error generating TLS config for SAP HANA connection: %w", err) } diff --git a/receiver/saphanareceiver/config.go b/receiver/saphanareceiver/config.go index 5d7a923ae18e..fae91e22cb47 100644 --- a/receiver/saphanareceiver/config.go +++ b/receiver/saphanareceiver/config.go @@ -22,9 +22,9 @@ const ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.TCPAddrConfig `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.TCPAddrConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index b9d3bd4bd840..7c1c9d3d6d6c 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -31,17 +31,17 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - scs := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scs := scraperhelper.NewDefaultControllerConfig() scs.CollectionInterval = 10 * time.Second return &Config{ TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: defaultEndpoint, }, - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: true, }, - ScraperControllerSettings: scs, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scs, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -62,5 +62,5 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&c.ScraperControllerSettings, set, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&c.ControllerConfig, set, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index c76951530f5a..2f14794462a9 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -37,7 +37,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), receivertest.NewNopCreateSettings(), &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index 5c348f3703e1..3d9e5eb2e842 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -3,19 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphan go 1.21 require ( - github.com/SAP/go-hdb v1.8.5 + github.com/SAP/go-hdb v1.8.11 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -45,21 +46,21 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 17d2af9484da..31157194b6ac 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -1,5 +1,5 @@ -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -25,6 +25,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -54,10 +56,10 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -68,26 +70,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -109,24 +111,24 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= 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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.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= @@ -141,8 +143,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index 8dda68c3e374..12793588a7b6 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -45,8 +45,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index b7eb499277d4..3d6d80bb1e6a 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -4,23 +4,24 @@ go 1.21 require ( github.com/gorilla/mux v1.8.1 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/klauspost/compress v1.17.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 ) require ( @@ -37,6 +38,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -50,20 +52,20 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -75,7 +77,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index c93ca629d211..538f60a500e8 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -32,12 +32,14 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= 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/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= 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= @@ -70,8 +72,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -86,44 +88,44 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -177,8 +179,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/sapmreceiver/package_test.go b/receiver/sapmreceiver/package_test.go new file mode 100644 index 000000000000..dd68ff5ed676 --- /dev/null +++ b/receiver/sapmreceiver/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sapmreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 18286090f0e2..2446b4f02676 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -174,8 +174,8 @@ func sendSapm( client := &http.Client{} if tlsEnabled { - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", @@ -310,8 +310,8 @@ func TestReception(t *testing.T) { config: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: tlsAddress, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", @@ -340,6 +340,7 @@ func TestReception(t *testing.T) { resp, err := sendSapm(tt.args.config.Endpoint, tt.args.sapm, tt.args.compression, tt.args.useTLS, "") require.NoError(t, err) assert.Equal(t, 200, resp.StatusCode) + assert.NoError(t, resp.Body.Close()) t.Log("SAPM Request Received") // retrieve received traces @@ -405,6 +406,7 @@ func TestAccessTokenPassthrough(t *testing.T) { resp, err := sendSapm(config.Endpoint, sapm, "gzip", false, tt.token) require.NoErrorf(t, err, "should not have failed when sending sapm %v", err) assert.Equal(t, 200, resp.StatusCode) + assert.NoError(t, resp.Body.Close()) got := sink.AllTraces() assert.Equal(t, 1, len(got)) diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index e1d3f55cca04..1ae28b779f17 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -48,8 +48,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:9943", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 3750f868b2c6..0edf9379db53 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.96.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/zap v1.27.0 @@ -39,6 +39,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -66,17 +67,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.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -87,7 +88,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 0b48de6cc937..f1d0934cd0f6 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -44,6 +44,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -117,44 +119,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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -213,8 +215,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 077614782af3..a5053ccc71fd 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -122,9 +122,6 @@ func (r *sfxReceiver) RegisterLogsConsumer(lc consumer.Logs) { // By convention the consumer of the received data is set when the receiver // instance is created. func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { - if r.metricsConsumer == nil && r.logsConsumer == nil { - return component.ErrNilNextConsumer - } if r.server != nil { return nil diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 442c570f0a42..07004c0cdc6b 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -616,8 +616,8 @@ func Test_sfxReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.ServerConfig.TLSSetting = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.ServerConfig.TLSSetting = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -666,8 +666,8 @@ func Test_sfxReceiver_TLS(t *testing.T) { require.NoErrorf(t, err, "should have no errors with new request: %v", err) req.Header.Set("Content-Type", "application/x-protobuf") - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 9e4f33132319..2e1190da56b4 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -38,8 +38,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "path", CertFile: "path", KeyFile: "path", @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod index e5a30b41483f..8573291ae2f0 100644 --- a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod +++ b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod @@ -23,7 +23,7 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.17.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) retract ( diff --git a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum index 7de0d7de3ebd..1ca14a33a4ac 100644 --- a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum +++ b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum @@ -43,7 +43,7 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 976ad36d5cc5..ec7cf2f779dd 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { return &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index e1233b5d8d4d..c9f5376928af 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -4,19 +4,19 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 - k8s.io/client-go v0.29.2 + k8s.io/client-go v0.29.3 ) require ( @@ -61,7 +61,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -131,17 +131,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -154,7 +154,7 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -165,14 +165,14 @@ require ( google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.2 // indirect - k8s.io/apimachinery v0.29.2 // indirect + k8s.io/api v0.29.3 // indirect + k8s.io/apimachinery v0.29.3 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index cd29f6bf3670..75cc74ad68f7 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -208,8 +208,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -479,8 +479,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -502,8 +502,8 @@ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULu github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU= @@ -553,8 +553,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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= @@ -562,66 +562,66 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -757,8 +757,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -974,8 +974,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -1021,12 +1021,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= +k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= +k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= +k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= +k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= +k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index 7fed4cd52ee0..bb885c9dad87 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -56,8 +56,8 @@ 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.ClientConfig.TLSSetting = configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.ClientConfig.TLSSetting = configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: cfg.TLSConfig.CAFile, CertFile: cfg.TLSConfig.CertFile, KeyFile: cfg.TLSConfig.KeyFile, diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 87e40f01ff0c..f03f23405542 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -77,7 +77,7 @@ func TestGetPrometheusConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -115,8 +115,8 @@ func TestGetPrometheusConfig(t *testing.T) { config: &Config{ ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", - TLSSetting: configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/test_cert.pem", }, InsecureSkipVerify: true, @@ -221,7 +221,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -268,7 +268,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: true, }, }, @@ -309,7 +309,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, }, }, @@ -350,9 +350,9 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { }, ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: configtls.ClientConfig{ Insecure: false, - TLSSetting: configtls.TLSSetting{ + TLSSetting: configtls.Config{ CAFile: "./testdata/test_cert.pem", }, }, diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index 0a1b1c15a3c2..935b5b193a3f 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, }, diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 6084583ed357..d82bd1a75a09 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -49,7 +49,7 @@ func createDefaultConfig() component.Config { GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, }, HTTP: &confighttp.ServerConfig{ diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 7ab5e7480248..b9a150372c52 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateReceiver(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } traceSink := new(consumertest.TracesSink) @@ -89,7 +89,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, } traceSink := new(consumertest.TracesSink) @@ -107,10 +107,10 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.AddrConfig{ Endpoint: "0.0.0.0:11800", - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -128,8 +128,8 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index f37b113c6693..83c296d9e4e9 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -8,27 +8,26 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,16 +57,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index b1192ccfcc52..ae68133f4f64 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -1,10 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.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 v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -18,8 +13,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= -github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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= @@ -30,8 +23,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= -github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/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= @@ -136,46 +127,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -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/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -233,8 +224,6 @@ golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -292,8 +281,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -309,8 +296,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/skywalkingreceiver/skywalking_receiver.go b/receiver/skywalkingreceiver/skywalking_receiver.go index 1da974c42fef..159bb6443ccd 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver.go +++ b/receiver/skywalkingreceiver/skywalking_receiver.go @@ -70,9 +70,6 @@ func newSkywalkingReceiver( // registerTraceConsumer register a TracesReceiver that receives trace func (sr *swReceiver) registerTraceConsumer(tc consumer.Traces) error { - if tc == nil { - return component.ErrNilNextConsumer - } var err error sr.traceReceiver, err = trace.NewReceiver(tc, sr.settings) if err != nil { @@ -83,9 +80,6 @@ func (sr *swReceiver) registerTraceConsumer(tc consumer.Traces) error { // registerTraceConsumer register a TracesReceiver that receives trace func (sr *swReceiver) registerMetricsConsumer(mc consumer.Metrics) error { - if mc == nil { - return component.ErrNilNextConsumer - } var err error sr.metricsReceiver, err = metrics.NewReceiver(mc, sr.settings) if err != nil { @@ -160,7 +154,7 @@ func (sr *swReceiver) startCollector(host component.Host) error { if sr.collectorGRPCEnabled() { var err error - sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServer(host, sr.settings.TelemetrySettings) + sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServerContext(context.Background(), host, sr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Skywalking gRPC Collector: %w", err) } diff --git a/receiver/snmpreceiver/config.go b/receiver/snmpreceiver/config.go index c0b275998264..2e6200ec1ae8 100644 --- a/receiver/snmpreceiver/config.go +++ b/receiver/snmpreceiver/config.go @@ -72,7 +72,7 @@ var ( // Config defines the configuration for the various elements of the receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` // Endpoint is the SNMP target to request data from. Must be formatted as [udp|tcp|][4|6|]://{host}:{port}. // Default: udp://localhost:161 diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index dfcac84c072a..29c7edafd703 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -31,7 +31,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates a config for SNMP with as many default values as possible func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, Timeout: defaultTimeout, }, @@ -66,7 +66,7 @@ func createMetricsReceiver( return nil, err } - return scraperhelper.NewScraperControllerReceiver(&snmpConfig.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&snmpConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } // addMissingConfigDefaults adds any missing config parameters that have defaults diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index d52d03f7d4b1..77eff2b9656d 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -34,7 +34,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: defaultCollectionInterval, Timeout: defaultTimeout, }, diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index beb1e2a39e7a..f690ed76d30b 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -74,7 +74,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.8.0 // indirect @@ -82,23 +82,23 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect @@ -124,7 +124,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 6a8313db87eb..5973623d1c25 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -155,8 +155,8 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -188,60 +188,60 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= go.opentelemetry.io/collector/config/confignet v0.96.0 h1:ZUwziVVxWgcRMqukfKfdEjxfgmfhGsX6J3GEzF/Pupk= go.opentelemetry.io/collector/config/confignet v0.96.0/go.mod h1:BVw5xkQ7TH2wH75cbph+dtOoxq1baWLuhdSYIAvuVu0= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= go.opentelemetry.io/collector/config/configretry v0.96.0 h1:rdZqq/ddPCjZCYYuqDGxrC93uHzQWhX5MQ9tt5uMSpM= go.opentelemetry.io/collector/config/configretry v0.96.0/go.mod h1:Nq7hp4nk+zeH0LYYsx348NHl02O89FnV45hcCCmqdtg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0 h1:eSjSBqWIN+OiEBgZhRq8B2LDmqZMgBRMNAF1oGfp4XI= go.opentelemetry.io/collector/extension/zpagesextension v0.96.0/go.mod h1:wWBmrP4H/gEInjtCiwZHlDj5+MuWI8bLybCSIrNXoNE= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -326,7 +326,7 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -367,8 +367,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/snowflakereceiver/config.go b/receiver/snowflakereceiver/config.go index e93a3377583f..289bc5d7e953 100644 --- a/receiver/snowflakereceiver/config.go +++ b/receiver/snowflakereceiver/config.go @@ -21,15 +21,15 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` - Account string `mapstructure:"account"` - Schema string `mapstructure:"schema"` - Warehouse string `mapstructure:"warehouse"` - Database string `mapstructure:"database"` - Role string `mapstructure:"role"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` + Account string `mapstructure:"account"` + Schema string `mapstructure:"schema"` + Warehouse string `mapstructure:"warehouse"` + Database string `mapstructure:"database"` + Role string `mapstructure:"role"` } func (cfg *Config) Validate() error { diff --git a/receiver/snowflakereceiver/config_test.go b/receiver/snowflakereceiver/config_test.go index 706eaa404205..4235f9615f5e 100644 --- a/receiver/snowflakereceiver/config_test.go +++ b/receiver/snowflakereceiver/config_test.go @@ -37,55 +37,55 @@ func TestValidateConfig(t *testing.T) { desc: "Missing username all else present", expect: errMissingUsername, conf: Config{ - Username: "", - Password: "password", - Account: "account", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "", + Password: "password", + Account: "account", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing password all else present", expect: errMissingPassword, conf: Config{ - Username: "username", - Password: "", - Account: "account", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "", + Account: "account", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing account all else present", expect: errMissingAccount, conf: Config{ - Username: "username", - Password: "password", - Account: "", - Warehouse: "warehouse", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "password", + Account: "", + Warehouse: "warehouse", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing warehouse all else present", expect: errMissingWarehouse, conf: Config{ - Username: "username", - Password: "password", - Account: "account", - Warehouse: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "password", + Account: "account", + Warehouse: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "Missing multiple check multierror", expect: multierror, conf: Config{ - Username: "username", - Password: "", - Account: "account", - Warehouse: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Username: "username", + Password: "", + Account: "account", + Warehouse: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, } @@ -122,7 +122,7 @@ func TestLoadConfig(t *testing.T) { Password: "securepassword", Account: "bigbusinessaccount", Warehouse: "metricWarehouse", - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 18 * time.Minute, InitialDelay: time.Second, }, diff --git a/receiver/snowflakereceiver/factory.go b/receiver/snowflakereceiver/factory.go index 91509b1ec7e0..1b8ebf7940c0 100644 --- a/receiver/snowflakereceiver/factory.go +++ b/receiver/snowflakereceiver/factory.go @@ -23,15 +23,15 @@ const ( ) func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultInterval return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Schema: defaultSchema, - Database: defaultDB, - Role: defaultRole, + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + Schema: defaultSchema, + Database: defaultDB, + Role: defaultRole, } } @@ -57,7 +57,7 @@ func createMetricsReceiver(_ context.Context, } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 5942b7556f0e..63c75568feb5 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.96.0 github.com/snowflakedb/gosnowflake v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -58,6 +58,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -81,8 +82,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -98,7 +99,7 @@ require ( golang.org/x/tools v0.15.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index 150178ff5bd4..341ad85190bc 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -186,22 +186,22 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -273,8 +273,8 @@ gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/solacereceiver/config.go b/receiver/solacereceiver/config.go index 40e75a25efd4..2e4316c1c986 100644 --- a/receiver/solacereceiver/config.go +++ b/receiver/solacereceiver/config.go @@ -37,7 +37,7 @@ type Config struct { // The maximum number of unacknowledged messages the Solace broker can transmit, to configure AMQP Link MaxUnacked int32 `mapstructure:"max_unacknowledged"` - TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"` + TLS configtls.ClientConfig `mapstructure:"tls,omitempty"` Auth Authentication `mapstructure:"auth"` diff --git a/receiver/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index 3c6a66e48b47..c3746a417c5a 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { }, Queue: "queue://#trace-profile123", MaxUnacked: 1234, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ Insecure: false, InsecureSkipVerify: false, }, diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index 574aaf522446..6e75725747f9 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { Broker: []string{defaultHost}, MaxUnacked: defaultMaxUnaked, Auth: Authentication{}, - TLS: configtls.TLSClientSetting{ + TLS: configtls.ClientConfig{ InsecureSkipVerify: false, Insecure: false, }, diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index aa97d0a7f24d..da5187090b4f 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/Azure/go-amqp v1.0.5 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -35,6 +35,7 @@ require ( 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.6.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 @@ -48,7 +49,7 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -57,7 +58,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index af91abfc7339..a82cc971f5cd 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -57,6 +57,8 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -108,22 +110,22 @@ 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.96.0 h1:qXA3biNps8LPYYCTJwepGu58sW0XInmwnQbkkWZchIg= go.opentelemetry.io/collector v0.96.0/go.mod h1:/i3zyRg23r7vloTLzKG/mRI2VkEt1Q4ARXbe3vKnAaE= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -202,8 +204,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/solacereceiver/messaging_service_test.go b/receiver/solacereceiver/messaging_service_test.go index 678ad4f5666d..f2099f5ab95d 100644 --- a/receiver/solacereceiver/messaging_service_test.go +++ b/receiver/solacereceiver/messaging_service_test.go @@ -85,7 +85,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting authentication errors", cfg: &Config{ // no password Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "set"}}, - TLS: configtls.TLSClientSetting{Insecure: false, InsecureSkipVerify: false}, + TLS: configtls.ClientConfig{Insecure: false, InsecureSkipVerify: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -97,7 +97,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting tls errors", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{TLSSetting: configtls.TLSSetting{KeyFile: "someKeyFile"}, Insecure: false}, + TLS: configtls.ClientConfig{TLSSetting: configtls.Config{KeyFile: "someKeyFile"}, Insecure: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -109,7 +109,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting success with TLS expecting an amqps connection", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{Insecure: false}, + TLS: configtls.ClientConfig{Insecure: false}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, @@ -133,7 +133,7 @@ func TestNewAMQPMessagingServiceFactory(t *testing.T) { name: "expecting success without TLS expecting an amqp connection", cfg: &Config{ // invalid to only provide a key file Auth: Authentication{PlainText: &SaslPlainTextConfig{Username: "user", Password: "password"}}, - TLS: configtls.TLSClientSetting{Insecure: true}, + TLS: configtls.ClientConfig{Insecure: true}, Broker: []string{broker}, Queue: queue, MaxUnacked: maxUnacked, diff --git a/receiver/solacereceiver/receiver.go b/receiver/solacereceiver/receiver.go index 70ad59598371..56e3d3fadbff 100644 --- a/receiver/solacereceiver/receiver.go +++ b/receiver/solacereceiver/receiver.go @@ -40,10 +40,6 @@ type solaceTracesReceiver struct { // newTracesReceiver creates a new solaceTraceReceiver as a receiver.Traces func newTracesReceiver(config *Config, set receiver.CreateSettings, nextConsumer consumer.Traces) (receiver.Traces, error) { - if nextConsumer == nil { - set.Logger.Warn("Next consumer in pipeline is null, stopping receiver") - return nil, component.ErrNilNextConsumer - } factory, err := newAMQPMessagingServiceFactory(config, set.Logger) if err != nil { diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 8dd873da9f02..f11bc0a84ad3 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -38,7 +38,7 @@ func TestClientCreation(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, @@ -67,7 +67,7 @@ func TestClientCreateRequest(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, @@ -148,7 +148,7 @@ func TestAPIRequestCreate(t *testing.T) { Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index f9ac3488aa65..077734fc06ba 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -22,11 +22,11 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - IdxEndpoint confighttp.ClientConfig `mapstructure:"indexer"` - SHEndpoint confighttp.ClientConfig `mapstructure:"search_head"` - CMEndpoint confighttp.ClientConfig `mapstructure:"cluster_master"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + IdxEndpoint confighttp.ClientConfig `mapstructure:"indexer"` + SHEndpoint confighttp.ClientConfig `mapstructure:"search_head"` + CMEndpoint confighttp.ClientConfig `mapstructure:"cluster_master"` } func (cfg *Config) Validate() (errors error) { diff --git a/receiver/splunkenterprisereceiver/config_test.go b/receiver/splunkenterprisereceiver/config_test.go index 1693c940d6eb..ce3e97047806 100644 --- a/receiver/splunkenterprisereceiver/config_test.go +++ b/receiver/splunkenterprisereceiver/config_test.go @@ -27,6 +27,8 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) } +var dummyID = component.MustNewID("dummy") + func TestEndpointCorrectness(t *testing.T) { // Declare errors for tests that should fail var errBad, errScheme error @@ -50,13 +52,13 @@ func TestEndpointCorrectness(t *testing.T) { expected: errBad, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Authentication{AuthenticatorID: component.NewID("dummy")}, + Auth: &configauth.Authentication{AuthenticatorID: dummyID}, }, SHEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Authentication{AuthenticatorID: component.NewID("dummy")}, + Auth: &configauth.Authentication{AuthenticatorID: dummyID}, }, CMEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Authentication{AuthenticatorID: component.NewID("dummy")}, + Auth: &configauth.Authentication{AuthenticatorID: dummyID}, }, }, }, @@ -65,7 +67,7 @@ func TestEndpointCorrectness(t *testing.T) { expected: errBad, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Authentication{AuthenticatorID: component.NewID("dummy")}, + Auth: &configauth.Authentication{AuthenticatorID: dummyID}, Endpoint: "123.321.12.1:1", }, }, @@ -75,7 +77,7 @@ func TestEndpointCorrectness(t *testing.T) { expected: errScheme, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Authentication{AuthenticatorID: component.NewID("dummy")}, + Auth: &configauth.Authentication{AuthenticatorID: dummyID}, Endpoint: "gss://123.124.32.12:90", }, }, diff --git a/receiver/splunkenterprisereceiver/factory.go b/receiver/splunkenterprisereceiver/factory.go index d0b9343c63a1..af86220bd48d 100644 --- a/receiver/splunkenterprisereceiver/factory.go +++ b/receiver/splunkenterprisereceiver/factory.go @@ -31,16 +31,16 @@ func createDefaultConfig() component.Config { httpCfg.Timeout = defaultMaxSearchWaitTime // Default ScraperController settings - scfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + scfg := scraperhelper.NewDefaultControllerConfig() scfg.CollectionInterval = defaultInterval scfg.Timeout = defaultMaxSearchWaitTime return &Config{ - IdxEndpoint: httpCfg, - SHEndpoint: httpCfg, - CMEndpoint: httpCfg, - ScraperControllerSettings: scfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + IdxEndpoint: httpCfg, + SHEndpoint: httpCfg, + CMEndpoint: httpCfg, + ControllerConfig: scfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -69,7 +69,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/splunkenterprisereceiver/factory_test.go b/receiver/splunkenterprisereceiver/factory_test.go index be717b5c73f8..49e8933efbea 100644 --- a/receiver/splunkenterprisereceiver/factory_test.go +++ b/receiver/splunkenterprisereceiver/factory_test.go @@ -34,7 +34,7 @@ func TestDefaultConfig(t *testing.T) { IdxEndpoint: cfg, SHEndpoint: cfg, CMEndpoint: cfg, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Minute, InitialDelay: 1 * time.Second, Timeout: 60 * time.Second, diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index d65b0e5e3aee..118542101919 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -52,13 +53,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -68,7 +69,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index 55692aed9ba6..765decb76527 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -74,38 +76,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -159,8 +161,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/splunkenterprisereceiver/scraper.go b/receiver/splunkenterprisereceiver/scraper.go index f132ed8c7b9e..978411b168dd 100644 --- a/receiver/splunkenterprisereceiver/scraper.go +++ b/receiver/splunkenterprisereceiver/scraper.go @@ -131,7 +131,7 @@ func (s *splunkScraper) scrapeLicenseUsageByIndex(ctx context.Context, now pcomm time.Sleep(2 * time.Second) } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -209,7 +209,7 @@ func (s *splunkScraper) scrapeAvgExecLatencyByHost(ctx context.Context, now pcom break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -291,7 +291,7 @@ func (s *splunkScraper) scrapeIndexerAvgRate(ctx context.Context, now pcommon.Ti break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -373,7 +373,7 @@ func (s *splunkScraper) scrapeIndexerPipelineQueues(ctx context.Context, now pco break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -486,7 +486,7 @@ func (s *splunkScraper) scrapeBucketsSearchableStatus(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -574,7 +574,7 @@ func (s *splunkScraper) scrapeIndexesBucketCountAdHoc(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -682,7 +682,7 @@ func (s *splunkScraper) scrapeSchedulerCompletionRatioByHost(ctx context.Context break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -760,7 +760,7 @@ func (s *splunkScraper) scrapeIndexerRawWriteSecondsByHost(ctx context.Context, break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -838,7 +838,7 @@ func (s *splunkScraper) scrapeIndexerCPUSecondsByHost(ctx context.Context, now p break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -916,7 +916,7 @@ func (s *splunkScraper) scrapeAvgIopsByHost(ctx context.Context, now pcommon.Tim break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } @@ -994,7 +994,7 @@ func (s *splunkScraper) scrapeSchedulerRunTimeByHost(ctx context.Context, now pc break } - if time.Since(start) > s.conf.ScraperControllerSettings.Timeout { + if time.Since(start) > s.conf.ControllerConfig.Timeout { errs.Add(errMaxSearchWaitTimeExceeded) return } diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index f6e6c547d1a2..e79f908089a8 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -95,7 +95,7 @@ func TestScraper(t *testing.T) { Endpoint: ts.URL, Auth: &configauth.Authentication{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: 1 * time.Second, Timeout: 11 * time.Second, diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index 22a73fbd3a0d..595968959d28 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -57,8 +57,8 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:8088", - TLSSetting: &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + TLSSetting: &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index e5bdfaab44c8..4750152de84e 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -11,17 +11,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 + go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -38,6 +39,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -57,16 +59,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.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -77,7 +79,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 5d01dfa78bbb..ed35227b03e8 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -150,8 +150,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -173,48 +173,48 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -301,8 +301,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac 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.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/receiver/splunkhecreceiver/package_test.go b/receiver/splunkhecreceiver/package_test.go new file mode 100644 index 000000000000..a1a634e3d239 --- /dev/null +++ b/receiver/splunkhecreceiver/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package splunkhecreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start")) +} diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index ec7ab4c2ed96..5f85cd8277e0 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -442,8 +442,8 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.TLSSetting = &configtls.TLSServerSetting{ - TLSSetting: configtls.TLSSetting{ + cfg.TLSSetting = &configtls.ServerConfig{ + TLSSetting: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, @@ -461,6 +461,9 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost()), "should not have failed to start log reception") require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost()), "should not fail to start log on second Start call") + defer func() { + require.NoError(t, r.Shutdown(context.Background())) + }() // If there are errors reported through ReportStatus this will retrieve it. <-time.After(500 * time.Millisecond) @@ -491,8 +494,8 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { req, err := http.NewRequestWithContext(context.Background(), "POST", url, bytes.NewReader(body)) require.NoErrorf(t, err, "should have no errors with new request: %v", err) - tlscs := configtls.TLSClientSetting{ - TLSSetting: configtls.TLSSetting{ + tlscs := configtls.ClientConfig{ + TLSSetting: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/client.crt", KeyFile: "./testdata/client.key", @@ -627,6 +630,9 @@ func Test_splunkhecReceiver_AccessTokenPassthrough(t *testing.T) { if tt.metric { exporter, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) + defer func() { + require.NoError(t, exporter.Shutdown(context.Background())) + }() assert.NoError(t, err) rcv, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), *config, exporter) assert.NoError(t, err) @@ -640,6 +646,9 @@ func Test_splunkhecReceiver_AccessTokenPassthrough(t *testing.T) { } else { exporter, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) + defer func() { + require.NoError(t, exporter.Shutdown(context.Background())) + }() assert.NoError(t, err) rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *config, exporter) assert.NoError(t, err) @@ -707,6 +716,9 @@ func Test_Logs_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { exporter, err := factory.CreateLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) assert.NoError(t, err) + defer func() { + require.NoError(t, exporter.Shutdown(context.Background())) + }() rcv, err := newLogsReceiver(receivertest.NewNopCreateSettings(), *cfg, exporter) assert.NoError(t, err) @@ -804,6 +816,9 @@ func Test_Metrics_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { exporter, err := factory.CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), exporterConfig) assert.NoError(t, exporter.Start(context.Background(), nil)) + defer func() { + require.NoError(t, exporter.Shutdown(context.Background())) + }() assert.NoError(t, err) rcv, err := newMetricsReceiver(receivertest.NewNopCreateSettings(), *cfg, exporter) assert.NoError(t, err) diff --git a/receiver/sqlqueryreceiver/config.go b/receiver/sqlqueryreceiver/config.go index e3459f5dc924..6928ed4c7753 100644 --- a/receiver/sqlqueryreceiver/config.go +++ b/receiver/sqlqueryreceiver/config.go @@ -10,7 +10,6 @@ import ( "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver/internal/metadata" ) type Config struct { @@ -18,11 +17,11 @@ type Config struct { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, }, } } diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index d4d4e11b2f7f..5d7c3b6db867 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { fname: "config.yaml", expected: &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -113,7 +113,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, ""), expected: &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -170,7 +170,7 @@ func TestLoadConfig(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) - assert.Equal(t, 10*time.Second, cfg.Config.ScraperControllerSettings.CollectionInterval) + assert.Equal(t, 10*time.Second, cfg.Config.ControllerConfig.CollectionInterval) } func TestConfig_Validate_Multierr(t *testing.T) { diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index e9b6c0e0b4fc..9ef845a64234 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -11,20 +11,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 - go.uber.org/multierr v1.11.0 + go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) require ( dario.cat/mergo v1.0.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect @@ -34,7 +35,7 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect - github.com/SAP/go-hdb v1.8.5 // indirect + github.com/SAP/go-hdb v1.8.11 // indirect github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect @@ -67,7 +68,7 @@ require ( 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/go-sql-driver/mysql v1.7.1 // indirect + github.com/go-sql-driver/mysql v1.8.0 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect @@ -120,38 +121,39 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/sijms/go-ora/v2 v2.8.8 // indirect + github.com/sijms/go-ora/v2 v2.8.10 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/snowflakedb/gosnowflake v1.8.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/valyala/fastjson v1.6.4 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.17.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index a1900271f062..6682c4f48cda 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -1,5 +1,7 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= @@ -30,8 +32,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= -github.com/SAP/go-hdb v1.8.5 h1:tjWpYHS+MmYCorVe0e7viyMC/7ER/O1bEONohqovHHk= -github.com/SAP/go-hdb v1.8.5/go.mod h1:CKo78azC/9UjzYY/EL9qFda4lNBszbmTgD8XLS0Jjfg= +github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE= +github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c= github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= @@ -126,8 +128,8 @@ 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/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= +github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -258,20 +260,20 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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/sijms/go-ora/v2 v2.8.8 h1:TvIjKrCPhVTYIzT7+rke/QKCY+ceVlTPfKXmgiuKX2s= -github.com/sijms/go-ora/v2 v2.8.8/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.10 h1:Ekhx0I+A9qVBy1eOLa2eIhHWWYwVTa0MM78KS6h+5fg= +github.com/sijms/go-ora/v2 v2.8.10/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/snowflakedb/gosnowflake v1.8.0 h1:4bQj8eAYGMkou/nICiIEb9jSbBLDDp5cB6JaKx9WwiA= @@ -302,30 +304,30 @@ 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= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -349,8 +351,8 @@ 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/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -367,8 +369,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -391,14 +393,14 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= 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.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -421,12 +423,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/sqlqueryreceiver/integration_test.go b/receiver/sqlqueryreceiver/integration_test.go index f8ba19dc4737..5f66d1e63b08 100644 --- a/receiver/sqlqueryreceiver/integration_test.go +++ b/receiver/sqlqueryreceiver/integration_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" @@ -48,7 +49,8 @@ func TestPostgresIntegrationLogsTrackingWithoutStorage(t *testing.T) { }() // Start the SQL Query receiver. - receiver, config, consumer := createTestLogsReceiverForPostgres(t, externalPort) + receiverCreateSettings := receivertest.NewNopCreateSettings() + receiver, config, consumer := createTestLogsReceiverForPostgres(t, externalPort, receiverCreateSettings) config.CollectionInterval = time.Second config.Queries = []sqlquery.Query{ { @@ -84,7 +86,7 @@ func TestPostgresIntegrationLogsTrackingWithoutStorage(t *testing.T) { require.NoError(t, err) // Start new SQL Query receiver with the same configuration. - receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort) + receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort, receiverCreateSettings) config.CollectionInterval = time.Second config.Queries = []sqlquery.Query{ { @@ -134,7 +136,8 @@ func TestPostgresIntegrationLogsTrackingWithStorage(t *testing.T) { storageExtension := storagetest.NewFileBackedStorageExtension("test", storageDir) // create SQL Query receiver configured with the File Storage extension - receiver, config, consumer := createTestLogsReceiverForPostgres(t, externalPort) + receiverCreateSettings := receivertest.NewNopCreateSettings() + receiver, config, consumer := createTestLogsReceiverForPostgres(t, externalPort, receiverCreateSettings) config.CollectionInterval = time.Second config.StorageID = &storageExtension.ID config.Queries = []sqlquery.Query{ @@ -176,7 +179,7 @@ func TestPostgresIntegrationLogsTrackingWithStorage(t *testing.T) { testAllSimpleLogs(t, consumer.AllLogs()) // start the SQL Query receiver again - receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort) + receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort, receiverCreateSettings) config.CollectionInterval = time.Second config.StorageID = &storageExtension.ID config.Queries = []sqlquery.Query{ @@ -209,7 +212,7 @@ func TestPostgresIntegrationLogsTrackingWithStorage(t *testing.T) { insertPostgresSimpleLogs(t, dbContainer, initialLogCount, newLogCount) // start the SQL Query receiver again - receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort) + receiver, config, consumer = createTestLogsReceiverForPostgres(t, externalPort, receiverCreateSettings) config.CollectionInterval = time.Second config.StorageID = &storageExtension.ID config.Queries = []sqlquery.Query{ @@ -276,7 +279,7 @@ func startPostgresDbContainer(t *testing.T, externalPort string) testcontainers. return container } -func createTestLogsReceiverForPostgres(t *testing.T, externalPort string) (*logsReceiver, *Config, *consumertest.LogsSink) { +func createTestLogsReceiverForPostgres(t *testing.T, externalPort string, receiverCreateSettings receiver.CreateSettings) (*logsReceiver, *Config, *consumertest.LogsSink) { factory := NewFactory() config := factory.CreateDefaultConfig().(*Config) config.CollectionInterval = time.Second @@ -284,7 +287,6 @@ func createTestLogsReceiverForPostgres(t *testing.T, externalPort string) (*logs config.DataSource = fmt.Sprintf("host=localhost port=%s user=otel password=otel sslmode=disable", externalPort) consumer := &consumertest.LogsSink{} - receiverCreateSettings := receivertest.NewNopCreateSettings() receiverCreateSettings.Logger = zap.NewExample() receiver, err := factory.CreateLogsReceiver( context.Background(), diff --git a/receiver/sqlqueryreceiver/logs_receiver.go b/receiver/sqlqueryreceiver/logs_receiver.go index d689397b4922..d343b8f48538 100644 --- a/receiver/sqlqueryreceiver/logs_receiver.go +++ b/receiver/sqlqueryreceiver/logs_receiver.go @@ -6,6 +6,7 @@ package sqlqueryreceiver // import "github.com/open-telemetry/opentelemetry-coll import ( "context" "database/sql" + "errors" "fmt" "time" @@ -16,7 +17,6 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.uber.org/multierr" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" @@ -174,21 +174,21 @@ func (receiver *logsReceiver) Shutdown(ctx context.Context) error { return nil } + var errs []error receiver.settings.Logger.Debug("stopping...") receiver.stopCollecting() for _, queryReceiver := range receiver.queryReceivers { - queryReceiver.shutdown(ctx) + errs = append(errs, queryReceiver.shutdown(ctx)) } - var errors error if receiver.storageClient != nil { - errors = multierr.Append(errors, receiver.storageClient.Close(ctx)) + errs = append(errs, receiver.storageClient.Close(ctx)) } receiver.isStarted = false receiver.settings.Logger.Debug("stopped.") - return errors + return errors.Join(errs...) } func (receiver *logsReceiver) stopCollecting() { @@ -286,7 +286,7 @@ func (queryReceiver *logsQueryReceiver) collect(ctx context.Context) (plog.Logs, return logs, fmt.Errorf("error getting rows: %w", err) } - var errs error + var errs []error scopeLogs := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords() for logsConfigIndex, logsConfig := range queryReceiver.query.Logs { for _, row := range rows { @@ -294,11 +294,11 @@ func (queryReceiver *logsQueryReceiver) collect(ctx context.Context) (plog.Logs, rowToLog(row, logsConfig, logRecord) logRecord.SetObservedTimestamp(observedAt) if logsConfigIndex == 0 { - errs = multierr.Append(errs, queryReceiver.storeTrackingValue(ctx, row)) + errs = append(errs, queryReceiver.storeTrackingValue(ctx, row)) } } } - return logs, nil + return logs, errors.Join(errs...) } func (queryReceiver *logsQueryReceiver) storeTrackingValue(ctx context.Context, row sqlquery.StringMap) error { @@ -319,5 +319,10 @@ func rowToLog(row sqlquery.StringMap, config sqlquery.LogsCfg, logRecord plog.Lo logRecord.Body().SetStr(row[config.BodyColumn]) } -func (queryReceiver *logsQueryReceiver) shutdown(_ context.Context) { +func (queryReceiver *logsQueryReceiver) shutdown(_ context.Context) error { + if queryReceiver.db == nil { + return nil + } + + return queryReceiver.db.Close() } diff --git a/receiver/sqlqueryreceiver/package_test.go b/receiver/sqlqueryreceiver/package_test.go new file mode 100644 index 000000000000..0544a360dc65 --- /dev/null +++ b/receiver/sqlqueryreceiver/package_test.go @@ -0,0 +1,15 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sqlqueryreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +// Regarding the godbus/dbus ignore: see https://github.com/99designs/keyring/issues/103 +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/godbus/dbus.(*Conn).inWorker")) +} diff --git a/receiver/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index 269237140998..262bb39b2033 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -45,13 +45,13 @@ func createMetricsReceiverFunc(sqlOpenerFunc sqlquery.SQLOpenerFunc, clientProvi dbProviderFunc := func() (*sql.DB, error) { return sqlOpenerFunc(sqlCfg.Driver, sqlCfg.DataSource) } - mp := sqlquery.NewScraper(id, query, sqlCfg.ScraperControllerSettings, settings.TelemetrySettings.Logger, sqlCfg.Config.Telemetry, dbProviderFunc, clientProviderFunc) + mp := sqlquery.NewScraper(id, query, sqlCfg.ControllerConfig, settings.TelemetrySettings.Logger, sqlCfg.Config.Telemetry, dbProviderFunc, clientProviderFunc) opt := scraperhelper.AddScraper(mp) opts = append(opts, opt) } return scraperhelper.NewScraperControllerReceiver( - &sqlCfg.ScraperControllerSettings, + &sqlCfg.ControllerConfig, settings, consumer, opts..., diff --git a/receiver/sqlqueryreceiver/receiver_test.go b/receiver/sqlqueryreceiver/receiver_test.go index ff5cd49f9d53..fa1b44679271 100644 --- a/receiver/sqlqueryreceiver/receiver_test.go +++ b/receiver/sqlqueryreceiver/receiver_test.go @@ -27,7 +27,7 @@ func TestCreateLogsReceiver(t *testing.T) { receivertest.NewNopCreateSettings(), &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, }, Driver: "mydriver", @@ -45,6 +45,7 @@ func TestCreateLogsReceiver(t *testing.T) { require.NoError(t, err) err = receiver.Start(ctx, componenttest.NewNopHost()) require.NoError(t, err) + require.NoError(t, receiver.Shutdown(ctx)) } func TestCreateMetricsReceiver(t *testing.T) { @@ -55,7 +56,7 @@ func TestCreateMetricsReceiver(t *testing.T) { receivertest.NewNopCreateSettings(), &Config{ Config: sqlquery.Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, @@ -75,6 +76,7 @@ func TestCreateMetricsReceiver(t *testing.T) { require.NoError(t, err) err = receiver.Start(ctx, componenttest.NewNopHost()) require.NoError(t, err) + require.NoError(t, receiver.Shutdown(ctx)) } func fakeDBConnect(string, string) (*sql.DB, error) { diff --git a/receiver/sqlserverreceiver/config.go b/receiver/sqlserverreceiver/config.go index 053d5c34ef89..4040c97bffa7 100644 --- a/receiver/sqlserverreceiver/config.go +++ b/receiver/sqlserverreceiver/config.go @@ -13,10 +13,10 @@ import ( // Config defines configuration for a sqlserver receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - InstanceName string `mapstructure:"instance_name"` - ComputerName string `mapstructure:"computer_name"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + InstanceName string `mapstructure:"instance_name"` + ComputerName string `mapstructure:"computer_name"` } func (cfg *Config) Validate() error { diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index e9abf6e521b9..6700bf0dae35 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -26,13 +26,13 @@ func TestValidate(t *testing.T) { { desc: "valid config", cfg: &Config{ - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "valid config with no metric settings", cfg: &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 2bef83a5b03c..fac2e6fee7c7 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -22,10 +22,10 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/sqlserverreceiver/factory_test.go b/receiver/sqlserverreceiver/factory_test.go index 866595671b19..ab13808f0899 100644 --- a/receiver/sqlserverreceiver/factory_test.go +++ b/receiver/sqlserverreceiver/factory_test.go @@ -32,7 +32,7 @@ func TestNewFactory(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index 8f232885a9d0..5b74fd94039e 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -40,6 +40,6 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, params, metricsConsumer, scraperhelper.AddScraper(scraper), + &cfg.ControllerConfig, params, metricsConsumer, scraperhelper.AddScraper(scraper), ) } diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 194693528bf1..0b0247f0efab 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -29,6 +29,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -44,8 +45,8 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.2 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -54,7 +55,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index 16695dc63c6a..1b02e6b7c6dc 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -64,20 +66,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -129,8 +131,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/sshcheckreceiver/config.go b/receiver/sshcheckreceiver/config.go index 46f73ecf5097..d1a14714aa4f 100644 --- a/receiver/sshcheckreceiver/config.go +++ b/receiver/sshcheckreceiver/config.go @@ -27,8 +27,8 @@ var ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configssh.SSHClientSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configssh.SSHClientSettings `mapstructure:",squash"` CheckSFTP bool `mapstructure:"check_sftp"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/sshcheckreceiver/config_test.go b/receiver/sshcheckreceiver/config_test.go index 94bc2a1ec411..fdaf556cd9a8 100644 --- a/receiver/sshcheckreceiver/config_test.go +++ b/receiver/sshcheckreceiver/config_test.go @@ -15,7 +15,6 @@ import ( "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/metadata" ) // check that OTel Collector patterns are implemented @@ -41,7 +40,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Endpoint: "goodhost:2222", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine(errMissingPasswordAndKeyFile), }, @@ -52,7 +51,7 @@ func TestValidate(t *testing.T) { Endpoint: "goodhost:2222", KeyFile: "/home/.ssh/id_rsa", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errMissingUsername, @@ -66,7 +65,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Password: "otelp", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: multierr.Combine( errInvalidEndpoint, @@ -80,7 +79,7 @@ func TestValidate(t *testing.T) { Username: "otelu", Password: "otelp", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: error(nil), }, @@ -92,7 +91,7 @@ func TestValidate(t *testing.T) { Username: "otelu", KeyFile: "/possibly/a_path", }, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: error(nil), }, @@ -126,7 +125,7 @@ func TestLoadConfig(t *testing.T) { expectedConfig, ok := NewFactory().CreateDefaultConfig().(*Config) require.True(t, ok) - expectedConfig.ScraperControllerSettings = scraperhelper.ScraperControllerSettings{ + expectedConfig.ControllerConfig = scraperhelper.ControllerConfig{ InitialDelay: time.Second, CollectionInterval: 10 * time.Second, } diff --git a/receiver/sshcheckreceiver/factory.go b/receiver/sshcheckreceiver/factory.go index 8fd7199f0785..e1b6dfd07eaf 100644 --- a/receiver/sshcheckreceiver/factory.go +++ b/receiver/sshcheckreceiver/factory.go @@ -25,11 +25,11 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 10 * time.Second return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, SSHClientSettings: configssh.SSHClientSettings{ Timeout: 10 * time.Second, }, @@ -54,5 +54,5 @@ func createMetricsReceiver(_ context.Context, params receiver.CreateSettings, rC return nil, err } - return scraperhelper.NewScraperControllerReceiver(&cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) + return scraperhelper.NewScraperControllerReceiver(&cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper)) } diff --git a/receiver/sshcheckreceiver/factory_test.go b/receiver/sshcheckreceiver/factory_test.go index 4de6d5198aaf..2dc748fc9529 100644 --- a/receiver/sshcheckreceiver/factory_test.go +++ b/receiver/sshcheckreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() var expectedCfg component.Config = &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index 70b5354aa374..26e4a7712073 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.96.0 github.com/pkg/sftp v1.13.6 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.21.0 @@ -25,8 +25,8 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect ) @@ -36,6 +36,7 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect @@ -64,7 +65,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index b35a968ff438..92a92513a906 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -70,24 +72,24 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/sshcheckreceiver/scraper_test.go b/receiver/sshcheckreceiver/scraper_test.go index 4628c5cdf01d..c0064c9684e6 100644 --- a/receiver/sshcheckreceiver/scraper_test.go +++ b/receiver/sshcheckreceiver/scraper_test.go @@ -151,7 +151,7 @@ func TestScraper(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = endpoint @@ -193,7 +193,7 @@ func TestScraperPropagatesResourceAttributes(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) cfg.MetricsBuilderConfig.ResourceAttributes.SSHEndpoint.Enabled = true - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = endpoint @@ -228,7 +228,7 @@ func TestScraperDoesNotErrForSSHErr(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "not-the-user" cfg.Password = "not-the-password" cfg.Endpoint = endpoint @@ -279,7 +279,7 @@ func TestTimeout(t *testing.T) { func TestCancellation(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond settings := receivertest.NewNopCreateSettings() @@ -304,7 +304,7 @@ func TestCancellation(t *testing.T) { func TestWithoutStartErrsNotPanics(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + cfg.ControllerConfig.CollectionInterval = 100 * time.Millisecond cfg.Username = "otelu" cfg.Password = "otelp" cfg.Endpoint = "localhost:22" diff --git a/receiver/statsdreceiver/config_test.go b/receiver/statsdreceiver/config_test.go index feac712d51cb..ef98e777f99a 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ NetAddr: confignet.AddrConfig{ Endpoint: "localhost:12345", - Transport: "custom_transport", + Transport: confignet.TransportTypeUDP6, }, AggregationInterval: 70 * time.Second, TimerHistogramMapping: []protocol.TimerHistogramMapping{ diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index 85d9fca0b95c..438564ebf7e5 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -18,7 +18,6 @@ import ( const ( defaultBindEndpoint = "localhost:8125" - defaultTransport = "udp" defaultAggregationInterval = 60 * time.Second defaultEnableMetricType = false defaultIsMonotonicCounter = false @@ -41,7 +40,7 @@ func createDefaultConfig() component.Config { return &Config{ NetAddr: confignet.AddrConfig{ Endpoint: defaultBindEndpoint, - Transport: defaultTransport, + Transport: confignet.TransportTypeUDP, }, AggregationInterval: defaultAggregationInterval, EnableMetricType: defaultEnableMetricType, diff --git a/receiver/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 095a8bd4a4d2..1ecf4f2710c4 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -29,15 +29,3 @@ func TestCreateReceiver(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } - -func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { - receiver, err := createMetricsReceiver( - context.Background(), - receivertest.NewNopCreateSettings(), - createDefaultConfig(), - nil, - ) - - assert.Error(t, err, "nil consumer") - assert.Nil(t, receiver) -} diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 66a833fa246c..e2ba3cb9e788 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,21 +7,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - gonum.org/v1/gonum v0.14.0 + gonum.org/v1/gonum v0.15.0 ) require ( @@ -33,6 +33,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -47,8 +48,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect @@ -56,7 +57,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index bac8d9949c59..4b9cb11d8991 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -66,26 +68,26 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -107,8 +109,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -137,12 +139,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/statsdreceiver/receiver.go b/receiver/statsdreceiver/receiver.go index aba562030ee1..3e05ca47eb2a 100644 --- a/receiver/statsdreceiver/receiver.go +++ b/receiver/statsdreceiver/receiver.go @@ -42,9 +42,6 @@ func newReceiver( config Config, nextConsumer consumer.Metrics, ) (receiver.Metrics, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } if config.NetAddr.Endpoint == "" { config.NetAddr.Endpoint = "localhost:8125" @@ -69,7 +66,7 @@ func newReceiver( func buildTransportServer(config Config) (transport.Server, error) { // TODO: Add unix socket transport implementations - trans := transport.NewTransport(strings.ToLower(config.NetAddr.Transport)) + trans := transport.NewTransport(strings.ToLower(string(config.NetAddr.Transport))) switch trans { case transport.UDP, transport.UDP4, transport.UDP6: return transport.NewUDPServer(trans, config.NetAddr.Endpoint) @@ -77,7 +74,7 @@ func buildTransportServer(config Config) (transport.Server, error) { return transport.NewTCPServer(trans, config.NetAddr.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q", config.NetAddr.Transport) + return nil, fmt.Errorf("unsupported transport %q", string(config.NetAddr.Transport)) } // Start starts a UDP server that can process StatsD messages. diff --git a/receiver/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index 9b2ce42c335d..b55456f80004 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -96,7 +96,7 @@ func Test_statsdreceiver_EndToEnd(t *testing.T) { return &Config{ NetAddr: confignet.AddrConfig{ Endpoint: defaultBindEndpoint, - Transport: defaultTransport, + Transport: confignet.TransportTypeUDP, }, AggregationInterval: 4 * time.Second, } diff --git a/receiver/statsdreceiver/testdata/config.yaml b/receiver/statsdreceiver/testdata/config.yaml index d3984fb9684c..ed319d8e5781 100644 --- a/receiver/statsdreceiver/testdata/config.yaml +++ b/receiver/statsdreceiver/testdata/config.yaml @@ -1,7 +1,7 @@ statsd: statsd/receiver_settings: endpoint: "localhost:12345" - transport: "custom_transport" + transport: "udp6" aggregation_interval: 70s enable_metric_type: false timer_histogram_mapping: diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index d36efa290f19..e876aa52c8e6 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -46,12 +47,12 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,9 +62,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 3b41da4d9fd6..a3901309e5aa 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -83,28 +85,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -170,12 +172,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 06b8092dd2a9..09c4e993304e 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -26,6 +26,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -45,13 +46,13 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -61,9 +62,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 3b41da4d9fd6..a3901309e5aa 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -28,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -83,28 +85,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -170,12 +172,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 0d944c3805b1..4b3137e4f19b 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -25,6 +25,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -43,11 +44,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,9 +58,9 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 56224eb2edc2..98847917285a 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,12 +164,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/vcenterreceiver/README.md b/receiver/vcenterreceiver/README.md index 3a4a0f83e791..184e27529c36 100644 --- a/receiver/vcenterreceiver/README.md +++ b/receiver/vcenterreceiver/README.md @@ -34,7 +34,7 @@ A “Read Only” user assigned to a vSphere with permissions to the vCenter ser | endpoint | | String | Endpoint to the vCenter Server or ESXi host that has the sdk path enabled. Required. The expected format is `://`

i.e: `https://vcsa.hostname.localnet` | | username | | String | Required | | password | | String | Required | -| tls | | TLSClientSetting | Not Required. Will use defaults for [configtls.TLSClientSetting](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md). By default insecure settings are rejected and certificate verification is on. | +| tls | | TLSClientSetting | Not Required. Will use defaults for [configtls.ClientConfig](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md). By default insecure settings are rejected and certificate verification is on. | | collection_interval | 2m | Duration | This receiver collects metrics on an interval. If the vCenter is fairly large, this value may need to be increased. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h` | | initial_delay | 1s | Duration | Defines how long this receiver waits before starting. | @@ -59,31 +59,4 @@ Details about the metrics produced by this receiver can be found in [metadata.ya ### Feature gates -#### Performance metrics dimensions - -These metrics were incorrectly dimensioned previously but the desired fix is a breaking change. To avoid breaking existing users, this feature gate is used to control whether the dimensions are fixed or not. This feature gate is planned to removed in two months. - -- `vcenter.vm.network.throughput` -- `vcenter.vm.network.usage` -- `vcenter.vm.network.packet.count` -- `vcenter.vm.disk.latency.avg` -- `vcenter.vm.disk.latency.max` -- `vcenter.host.network.usage` -- `vcenter.host.network.throughput` -- `vcenter.host.network.packet.count` -- `vcenter.host.network.packet.errors` -- `vcenter.host.disk.latency.avg` -- `vcenter.host.disk.latency.max` -- `vcenter.host.disk.throughput` - -These metrics were improperly dimensioned and needed another metric attribute `object` in order to properly dimension the data. - -#### v0.93.0, January 2024 - -- The receiver will emit the `object` metric attribute by default -- `receiver.vcenter.emitPerfMetricsWithObjects` is *enabled* by default. - -#### v0.95.0, February 2024 - -- The feature gates are removed. -- Performance metrics will always include the `object` metric attribute. +The `receiver.vcenter.emitPerfMetricsWithObjects` is now stable and will be removed in v0.97.0. diff --git a/receiver/vcenterreceiver/client.go b/receiver/vcenterreceiver/client.go index 36ce302f2f75..c6d14a5e68b3 100644 --- a/receiver/vcenterreceiver/client.go +++ b/receiver/vcenterreceiver/client.go @@ -89,14 +89,13 @@ func (vc *vcenterClient) Datacenters(ctx context.Context) ([]*object.Datacenter, return datacenters, nil } -// Clusters returns the clusterComputeResources of the vSphere SDK -func (vc *vcenterClient) Clusters(ctx context.Context, datacenter *object.Datacenter) ([]*object.ClusterComputeResource, error) { +func (vc *vcenterClient) Computes(ctx context.Context, datacenter *object.Datacenter) ([]*object.ComputeResource, error) { vc.finder = vc.finder.SetDatacenter(datacenter) - clusters, err := vc.finder.ClusterComputeResourceList(ctx, "*") + computes, err := vc.finder.ComputeResourceList(ctx, "*") if err != nil { - return []*object.ClusterComputeResource{}, fmt.Errorf("unable to get cluster lists: %w", err) + return []*object.ComputeResource{}, fmt.Errorf("unable to get compute lists: %w", err) } - return clusters, nil + return computes, nil } // ResourcePools returns the resourcePools in the vSphere SDK diff --git a/receiver/vcenterreceiver/client_test.go b/receiver/vcenterreceiver/client_test.go index 58b6c4221f82..fb3cf28ce1a3 100644 --- a/receiver/vcenterreceiver/client_test.go +++ b/receiver/vcenterreceiver/client_test.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" ) -func TestGetClusters(t *testing.T) { +func TestGetComputes(t *testing.T) { simulator.Test(func(ctx context.Context, c *vim25.Client) { finder := find.NewFinder(c) client := vcenterClient{ @@ -27,9 +27,9 @@ func TestGetClusters(t *testing.T) { } dc, err := finder.DefaultDatacenter(ctx) require.NoError(t, err) - clusters, err := client.Clusters(ctx, dc) + computes, err := client.Computes(ctx, dc) require.NoError(t, err) - require.NotEmpty(t, clusters, 0) + require.NotEmpty(t, computes, 0) }) } @@ -73,7 +73,7 @@ func TestSessionReestablish(t *testing.T) { Username: simulator.DefaultLogin.Username(), Password: configopaque.String(pw), Endpoint: fmt.Sprintf("%s://%s", c.URL().Scheme, c.URL().Host), - TLSClientSetting: configtls.TLSClientSetting{ + ClientConfig: configtls.ClientConfig{ Insecure: true, }, }, diff --git a/receiver/vcenterreceiver/config.go b/receiver/vcenterreceiver/config.go index 40f31e0fd73d..5a4c40779559 100644 --- a/receiver/vcenterreceiver/config.go +++ b/receiver/vcenterreceiver/config.go @@ -18,12 +18,12 @@ import ( // Config is the configuration of the receiver type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - configtls.TLSClientSetting `mapstructure:"tls,omitempty"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` - Endpoint string `mapstructure:"endpoint"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + configtls.ClientConfig `mapstructure:"tls,omitempty"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` + Endpoint string `mapstructure:"endpoint"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Validate checks to see if the supplied config will work for the receiver diff --git a/receiver/vcenterreceiver/config_test.go b/receiver/vcenterreceiver/config_test.go index 13297408db20..18832d495ac2 100644 --- a/receiver/vcenterreceiver/config_test.go +++ b/receiver/vcenterreceiver/config_test.go @@ -29,50 +29,50 @@ func TestConfigValidation(t *testing.T) { { desc: "empty endpoint", cfg: Config{ - Endpoint: "", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("no endpoint was provided"), }, { desc: "with endpoint", cfg: Config{ - Endpoint: "http://vcsa.some-host", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "http://vcsa.some-host", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, }, { desc: "not http or https", cfg: Config{ - Endpoint: "ws://vcsa.some-host", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "ws://vcsa.some-host", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("url scheme must be http or https"), }, { desc: "unparseable URL", cfg: Config{ - Endpoint: "h" + string(rune(0x7f)), - TLSClientSetting: configtls.TLSClientSetting{}, - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "h" + string(rune(0x7f)), + ClientConfig: configtls.ClientConfig{}, + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("unable to parse url"), }, { desc: "no username", cfg: Config{ - Endpoint: "https://vcsa.some-host", - Password: "otelp", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "https://vcsa.some-host", + Password: "otelp", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("username not provided"), }, { desc: "no password", cfg: Config{ - Endpoint: "https://vcsa.some-host", - Username: "otelu", - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + Endpoint: "https://vcsa.some-host", + Username: "otelu", + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), }, expectedErr: errors.New("password not provided"), }, diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index 673d40d088a3..a25e8043fab6 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -27,13 +27,13 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = 2 * time.Minute return &Config{ - ScraperControllerSettings: cfg, - TLSClientSetting: configtls.TLSClientSetting{}, - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), + ControllerConfig: cfg, + ClientConfig: configtls.ClientConfig{}, + MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } @@ -62,7 +62,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &cfg.ScraperControllerSettings, + &cfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index f46fb46566e4..3d5f695a1330 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0 github.com/stretchr/testify v1.9.0 - github.com/vmware/govmomi v0.35.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + github.com/vmware/govmomi v0.36.1 + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -77,15 +77,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/testcontainers/testcontainers-go v0.27.0 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -97,7 +97,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index df94d568eb6c..d228da52b4a7 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -122,8 +122,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -146,32 +146,32 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/vmware/govmomi v0.35.0 h1:vN6m2J5ezSJomSTHyKbvpfoEZTn2mGXWg2FFpjRTRp0= -github.com/vmware/govmomi v0.35.0/go.mod h1:VvIo6siOYFKdF9eU7qrY9+j/F99DV/LtSgsOpxFXJAY= +github.com/vmware/govmomi v0.36.1 h1:+E/nlfteQ8JvC0xhuKAfpnMsuIeGeGj7rJwqENUcWm8= +github.com/vmware/govmomi v0.36.1/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -219,7 +219,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -240,8 +239,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index 44191affcc23..49f08eb1c150 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -61,7 +61,7 @@ func TestIntegration(t *testing.T) { rCfg.Endpoint = fmt.Sprintf("%s://%s", c.URL().Scheme, c.URL().Host) rCfg.Username = simulator.DefaultLogin.Username() rCfg.Password = configopaque.String(pw) - rCfg.TLSClientSetting = configtls.TLSClientSetting{ + rCfg.ClientConfig = configtls.ClientConfig{ Insecure: true, } }), diff --git a/receiver/vcenterreceiver/internal/mockserver/README.md b/receiver/vcenterreceiver/internal/mockserver/README.md index b1b6e6e56c67..276dd249540e 100644 --- a/receiver/vcenterreceiver/internal/mockserver/README.md +++ b/receiver/vcenterreceiver/internal/mockserver/README.md @@ -35,7 +35,7 @@ And then running the receiver against the proxy. ```yaml receivers: vcenter: - endpoint: https://localhost:56626 + endpoint: http://localhost:55626 username: "otelu" password: "otelp" tls: diff --git a/receiver/vcenterreceiver/internal/mockserver/client_mock.go b/receiver/vcenterreceiver/internal/mockserver/client_mock.go index 492e7b8642a4..edfe2484a150 100644 --- a/receiver/vcenterreceiver/internal/mockserver/client_mock.go +++ b/receiver/vcenterreceiver/internal/mockserver/client_mock.go @@ -206,6 +206,12 @@ func routeRetreiveProperties(t *testing.T, body map[string]any) ([]byte, error) } } + if ps, ok := propSet["pathSet"].(string); ok { + if ps == "owner" { + return loadResponse("resource-pool-single.xml") + } + } + if ss, ok := objectSet["selectSet"].(map[string]any); ok && ss["path"] == "resourcePool" { return loadResponse("resource-pool-group.xml") } diff --git a/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-single.xml b/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-single.xml new file mode 100644 index 000000000000..6b1ec59e626e --- /dev/null +++ b/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-single.xml @@ -0,0 +1,17 @@ + + + + + + resgroup-9 + + owner + domain-c8 + + + + + diff --git a/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-summary.xml b/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-summary.xml index a7fcd373d72b..2e1af04ebf1c 100644 --- a/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-summary.xml +++ b/receiver/vcenterreceiver/internal/mockserver/responses/resource-pool-summary.xml @@ -1,5 +1,8 @@ - + @@ -93,6 +96,15 @@ 0 + + vm + + vm-1040 + vm-6005 + + diff --git a/receiver/vcenterreceiver/metrics.go b/receiver/vcenterreceiver/metrics.go index 20f4b1cf5136..1cca7ca7ea23 100644 --- a/receiver/vcenterreceiver/metrics.go +++ b/receiver/vcenterreceiver/metrics.go @@ -152,11 +152,7 @@ func (v *vcenterMetricScraper) recordHostPerformanceMetrics( errs.AddPartial(1, err) return } - if v.emitPerfWithObject { - v.processHostPerformance(info.results) - } else { - v.processHostPerformanceWithoutObject(info.results) - } + v.processHostPerformance(info.results) } // vmPerfMetricList may be customizable in the future but here is the full list of Virtual Machine Performance Counters @@ -196,13 +192,7 @@ func (v *vcenterMetricScraper) recordVMPerformance( errs.AddPartial(1, err) return } - - if v.emitPerfWithObject { - v.processVMPerformanceMetrics(info) - } else { - v.processVMPerformanceMetricsWithoutObject(info) - } - + v.processVMPerformanceMetrics(info) } func (v *vcenterMetricScraper) processVMPerformanceMetrics(info *perfSampleResult) { @@ -240,41 +230,6 @@ func (v *vcenterMetricScraper) processVMPerformanceMetrics(info *perfSampleResul } } -func (v *vcenterMetricScraper) processVMPerformanceMetricsWithoutObject(info *perfSampleResult) { - for _, m := range info.results { - for _, val := range m.Value { - for j, nestedValue := range val.Value { - si := m.SampleInfo[j] - switch val.Name { - // Performance monitoring level 1 metrics - case "net.bytesTx.average": - v.mb.RecordVcenterVMNetworkThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionTransmitted) - case "net.bytesRx.average": - v.mb.RecordVcenterVMNetworkThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionReceived) - case "net.usage.average": - v.mb.RecordVcenterVMNetworkUsageDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue) - case "net.packetsTx.summation": - v.mb.RecordVcenterVMNetworkPacketCountDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionTransmitted) - case "net.packetsRx.summation": - v.mb.RecordVcenterVMNetworkPacketCountDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionReceived) - - // Performance monitoring level 2 metrics required - case "disk.totalReadLatency.average": - v.mb.RecordVcenterVMDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionRead, metadata.AttributeDiskTypePhysical) - case "virtualDisk.totalReadLatency.average": - v.mb.RecordVcenterVMDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionRead, metadata.AttributeDiskTypeVirtual) - case "disk.totalWriteLatency.average": - v.mb.RecordVcenterVMDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionWrite, metadata.AttributeDiskTypePhysical) - case "virtualDisk.totalWriteLatency.average": - v.mb.RecordVcenterVMDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionWrite, metadata.AttributeDiskTypeVirtual) - case "disk.maxTotalLatency.latest": - v.mb.RecordVcenterVMDiskLatencyMaxDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue) - } - } - } - } -} - func (v *vcenterMetricScraper) processHostPerformance(metrics []performance.EntityMetric) { for _, m := range metrics { for _, val := range m.Value { @@ -315,44 +270,3 @@ func (v *vcenterMetricScraper) processHostPerformance(metrics []performance.Enti } } } - -func (v *vcenterMetricScraper) processHostPerformanceWithoutObject(metrics []performance.EntityMetric) { - for _, m := range metrics { - for _, val := range m.Value { - for j, nestedValue := range val.Value { - si := m.SampleInfo[j] - switch val.Name { - // Performance monitoring level 1 metrics - case "net.usage.average": - v.mb.RecordVcenterHostNetworkUsageDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue) - case "net.bytesTx.average": - v.mb.RecordVcenterHostNetworkThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionTransmitted) - case "net.bytesRx.average": - v.mb.RecordVcenterHostNetworkThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionReceived) - case "net.packetsTx.summation": - v.mb.RecordVcenterHostNetworkPacketCountDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionTransmitted) - case "net.packetsRx.summation": - v.mb.RecordVcenterHostNetworkPacketCountDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionReceived) - - // Following requires performance level 2 - case "net.errorsRx.summation": - v.mb.RecordVcenterHostNetworkPacketErrorsDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionReceived) - case "net.errorsTx.summation": - v.mb.RecordVcenterHostNetworkPacketErrorsDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeThroughputDirectionTransmitted) - case "disk.totalWriteLatency.average": - v.mb.RecordVcenterHostDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionWrite) - case "disk.totalReadLatency.average": - v.mb.RecordVcenterHostDiskLatencyAvgDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionRead) - case "disk.maxTotalLatency.latest": - v.mb.RecordVcenterHostDiskLatencyMaxDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue) - - // Following requires performance level 4 - case "disk.read.average": - v.mb.RecordVcenterHostDiskThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionRead) - case "disk.write.average": - v.mb.RecordVcenterHostDiskThroughputDataPointWithoutObject(pcommon.NewTimestampFromTime(si.Timestamp), nestedValue, metadata.AttributeDiskDirectionWrite) - } - } - } - } -} diff --git a/receiver/vcenterreceiver/scraper.go b/receiver/vcenterreceiver/scraper.go index d4b8cbd26eb9..9bfd0d27187e 100644 --- a/receiver/vcenterreceiver/scraper.go +++ b/receiver/vcenterreceiver/scraper.go @@ -25,20 +25,23 @@ const ( emitPerfMetricsWithObjectsFeatureGateID = "receiver.vcenter.emitPerfMetricsWithObjects" ) -var emitPerfMetricsWithObjects = featuregate.GlobalRegistry().MustRegister( +var _ = featuregate.GlobalRegistry().MustRegister( emitPerfMetricsWithObjectsFeatureGateID, - featuregate.StageBeta, - featuregate.WithRegisterDescription("When enabled, the receiver emits vCenter performance metrics with object metric label dimension."), + featuregate.StageStable, + featuregate.WithRegisterToVersion("v0.97.0"), ) var _ receiver.Metrics = (*vcenterMetricScraper)(nil) type vcenterMetricScraper struct { - client *vcenterClient - config *Config - mb *metadata.MetricsBuilder - logger *zap.Logger - emitPerfWithObject bool + client *vcenterClient + config *Config + mb *metadata.MetricsBuilder + logger *zap.Logger + + // map of vm name => compute name + vmToComputeMap map[string]string + vmToResourcePool map[string]*object.ResourcePool } func newVmwareVcenterScraper( @@ -48,11 +51,12 @@ func newVmwareVcenterScraper( ) *vcenterMetricScraper { client := newVcenterClient(config) return &vcenterMetricScraper{ - client: client, - config: config, - logger: logger, - mb: metadata.NewMetricsBuilder(config.MetricsBuilderConfig, settings), - emitPerfWithObject: emitPerfMetricsWithObjects.IsEnabled(), + client: client, + config: config, + logger: logger, + mb: metadata.NewMetricsBuilder(config.MetricsBuilderConfig, settings), + vmToComputeMap: make(map[string]string), + vmToResourcePool: make(map[string]*object.ResourcePool), } } @@ -80,6 +84,11 @@ func (v *vcenterMetricScraper) scrape(ctx context.Context) (pmetric.Metrics, err } err := v.collectDatacenters(ctx) + + // cleanup so any inventory moves are accounted for + v.vmToComputeMap = make(map[string]string) + v.vmToResourcePool = make(map[string]*object.ResourcePool) + return v.mb.Emit(), err } @@ -96,26 +105,29 @@ func (v *vcenterMetricScraper) collectDatacenters(ctx context.Context) error { } func (v *vcenterMetricScraper) collectClusters(ctx context.Context, datacenter *object.Datacenter, errs *scrapererror.ScrapeErrors) { - clusters, err := v.client.Clusters(ctx, datacenter) + computes, err := v.client.Computes(ctx, datacenter) if err != nil { errs.Add(err) return } + now := pcommon.NewTimestampFromTime(time.Now()) - for _, c := range clusters { + v.collectResourcePools(ctx, now, errs) + for _, c := range computes { v.collectHosts(ctx, now, c, errs) v.collectDatastores(ctx, now, c, errs) poweredOnVMs, poweredOffVMs := v.collectVMs(ctx, now, c, errs) - v.collectCluster(ctx, now, c, poweredOnVMs, poweredOffVMs, errs) + if c.Reference().Type == "ClusterComputeResource" { + v.collectCluster(ctx, now, c, poweredOnVMs, poweredOffVMs, errs) + } } - v.collectResourcePools(ctx, now, errs) } func (v *vcenterMetricScraper) collectCluster( ctx context.Context, now pcommon.Timestamp, - c *object.ClusterComputeResource, + c *object.ComputeResource, poweredOnVMs, poweredOffVMs int64, errs *scrapererror.ScrapeErrors, ) { @@ -143,17 +155,17 @@ func (v *vcenterMetricScraper) collectCluster( func (v *vcenterMetricScraper) collectDatastores( ctx context.Context, colTime pcommon.Timestamp, - cluster *object.ClusterComputeResource, + compute *object.ComputeResource, errs *scrapererror.ScrapeErrors, ) { - datastores, err := cluster.Datastores(ctx) + datastores, err := compute.Datastores(ctx) if err != nil { errs.AddPartial(1, err) return } for _, ds := range datastores { - v.collectDatastore(ctx, colTime, ds, cluster, errs) + v.collectDatastore(ctx, colTime, ds, compute, errs) } } @@ -161,7 +173,7 @@ func (v *vcenterMetricScraper) collectDatastore( ctx context.Context, now pcommon.Timestamp, ds *object.Datastore, - cluster *object.ClusterComputeResource, + compute *object.ComputeResource, errs *scrapererror.ScrapeErrors, ) { var moDS mo.Datastore @@ -173,7 +185,9 @@ func (v *vcenterMetricScraper) collectDatastore( v.recordDatastoreProperties(now, moDS) rb := v.mb.NewResourceBuilder() - rb.SetVcenterClusterName(cluster.Name()) + if compute.Reference().Type == "ClusterComputeResource" { + rb.SetVcenterClusterName(compute.Name()) + } rb.SetVcenterDatastoreName(moDS.Name) v.mb.EmitForResource(metadata.WithResource(rb.Emit())) } @@ -181,17 +195,17 @@ func (v *vcenterMetricScraper) collectDatastore( func (v *vcenterMetricScraper) collectHosts( ctx context.Context, colTime pcommon.Timestamp, - cluster *object.ClusterComputeResource, + compute *object.ComputeResource, errs *scrapererror.ScrapeErrors, ) { - hosts, err := cluster.Hosts(ctx) + hosts, err := compute.Hosts(ctx) if err != nil { errs.AddPartial(1, err) return } for _, h := range hosts { - v.collectHost(ctx, colTime, h, cluster, errs) + v.collectHost(ctx, colTime, h, compute, errs) } } @@ -199,26 +213,34 @@ func (v *vcenterMetricScraper) collectHost( ctx context.Context, now pcommon.Timestamp, host *object.HostSystem, - cluster *object.ClusterComputeResource, + compute *object.ComputeResource, errs *scrapererror.ScrapeErrors, ) { + var hwSum mo.HostSystem err := host.Properties(ctx, host.Reference(), []string{ + "name", "config", "summary.hardware", "summary.quickStats", + "vm", }, &hwSum) if err != nil { errs.AddPartial(1, err) return } + + for _, vmRef := range hwSum.Vm { + v.vmToComputeMap[vmRef.Value] = compute.Name() + } + v.recordHostSystemMemoryUsage(now, hwSum) v.recordHostPerformanceMetrics(ctx, hwSum, errs) rb := v.mb.NewResourceBuilder() rb.SetVcenterHostName(host.Name()) - rb.SetVcenterClusterName(cluster.Name()) + rb.SetVcenterClusterName(compute.Name()) v.mb.EmitForResource(metadata.WithResource(rb.Emit())) } @@ -238,11 +260,23 @@ func (v *vcenterMetricScraper) collectResourcePools( "summary", "summary.quickStats", "name", + "vm", }, &moRP) if err != nil { errs.AddPartial(1, err) continue } + + computeRef, err := rp.Owner(ctx) + if err != nil { + errs.AddPartial(1, err) + continue + } + for _, vmRef := range moRP.Vm { + v.vmToComputeMap[vmRef.Value] = computeRef.Reference().Value + v.vmToResourcePool[vmRef.Value] = rp + } + v.recordResourcePool(ts, moRP) rb := v.mb.NewResourceBuilder() rb.SetVcenterResourcePoolName(rp.Name()) @@ -254,7 +288,7 @@ func (v *vcenterMetricScraper) collectResourcePools( func (v *vcenterMetricScraper) collectVMs( ctx context.Context, colTime pcommon.Timestamp, - cluster *object.ClusterComputeResource, + compute *object.ComputeResource, errs *scrapererror.ScrapeErrors, ) (poweredOnVMs int64, poweredOffVMs int64) { vms, err := v.client.VMs(ctx) @@ -263,6 +297,15 @@ func (v *vcenterMetricScraper) collectVMs( return } for _, vm := range vms { + computeName, ok := v.vmToComputeMap[vm.Reference().Value] + if !ok { + continue + } + + if computeName != compute.Reference().Value && computeName != compute.Name() { + continue + } + var moVM mo.VirtualMachine err := vm.Properties(ctx, vm.Reference(), []string{ "config", @@ -281,21 +324,43 @@ func (v *vcenterMetricScraper) collectVMs( poweredOnVMs++ } - host, err := vm.HostSystem(ctx) + vmHost, err := vm.HostSystem(ctx) if err != nil { errs.AddPartial(1, err) return } - hostname, err := host.ObjectName(ctx) + + // vms are optional without a resource pool + rp, _ := vm.ResourcePool(ctx) + + if rp != nil { + rpCompute, rpErr := rp.Owner(ctx) + if rpErr != nil { + errs.AddPartial(1, err) + return + } + // not part of this cluster + if rpCompute.Reference().Value != compute.Reference().Value { + continue + } + stored, ok := v.vmToResourcePool[vm.Reference().Value] + if ok { + rp = stored + } + } + + hostname, err := vmHost.ObjectName(ctx) if err != nil { errs.AddPartial(1, err) return } var hwSum mo.HostSystem - err = host.Properties(ctx, host.Reference(), + err = vmHost.Properties(ctx, vmHost.Reference(), []string{ + "name", "summary.hardware", + "vm", }, &hwSum) if err != nil { @@ -313,8 +378,14 @@ func (v *vcenterMetricScraper) collectVMs( rb := v.mb.NewResourceBuilder() rb.SetVcenterVMName(vm.Name()) rb.SetVcenterVMID(vmUUID) - rb.SetVcenterClusterName(cluster.Name()) + if compute.Reference().Type == "ClusterComputeResource" { + rb.SetVcenterClusterName(compute.Name()) + } rb.SetVcenterHostName(hostname) + if rp != nil && rp.Name() != "" { + rb.SetVcenterResourcePoolName(rp.Name()) + rb.SetVcenterResourcePoolInventoryPath(rp.InventoryPath) + } v.mb.EmitForResource(metadata.WithResource(rb.Emit())) } return poweredOnVMs, poweredOffVMs diff --git a/receiver/vcenterreceiver/scraper_test.go b/receiver/vcenterreceiver/scraper_test.go index 6a74153812d7..eabe9896fd53 100644 --- a/receiver/vcenterreceiver/scraper_test.go +++ b/receiver/vcenterreceiver/scraper_test.go @@ -33,38 +33,6 @@ func TestScrape(t *testing.T) { testScrape(ctx, t, cfg) } -func TestScrapeWithoutPerfObjects(t *testing.T) { - ctx := context.Background() - mockServer := mock.MockServer(t, false) - defer mockServer.Close() - - cfg := &Config{ - MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - Endpoint: mockServer.URL, - Username: mock.MockUsername, - Password: mock.MockPassword, - } - - scraper := newVmwareVcenterScraper(zap.NewNop(), cfg, receivertest.NewNopCreateSettings()) - scraper.emitPerfWithObject = false - - metrics, err := scraper.scrape(ctx) - require.NoError(t, err) - require.NotEqual(t, metrics.MetricCount(), 0) - - goldenPath := filepath.Join("testdata", "metrics", "expected_without_objects.yaml") - expectedMetrics, err := golden.ReadMetrics(goldenPath) - require.NoError(t, err) - - err = pmetrictest.CompareMetrics(expectedMetrics, metrics, - pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreTimestamp(), - pmetrictest.IgnoreResourceMetricsOrder(), - pmetrictest.IgnoreMetricDataPointsOrder(), - ) - require.NoError(t, err) - require.NoError(t, scraper.Shutdown(ctx)) -} - func TestScrape_TLS(t *testing.T) { ctx := context.Background() mockServer := mock.MockServer(t, true) diff --git a/receiver/vcenterreceiver/testdata/integration/expected.yaml b/receiver/vcenterreceiver/testdata/integration/expected.yaml index 262810bd62a8..3b0a88a63f41 100644 --- a/receiver/vcenterreceiver/testdata/integration/expected.yaml +++ b/receiver/vcenterreceiver/testdata/integration/expected.yaml @@ -1,95 +1,63 @@ resourceMetrics: - resource: attributes: - - key: vcenter.host.name + - key: vcenter.resource_pool.name value: - stringValue: DC0_C0_H0 - - key: vcenter.cluster.name + stringValue: Resources + - key: vcenter.resource_pool.inventory_path value: - stringValue: DC0_C0 + stringValue: /DC0/host/DC0_H0/Resources scopeMetrics: - metrics: - - description: The amount of CPU used by the host. - name: vcenter.host.cpu.usage + - description: The amount of shares of CPU in the resource pool. + name: vcenter.resource_pool.cpu.shares sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: MHz - - description: The CPU utilization of the host system. - gauge: - dataPoints: - - asDouble: 1.4603312990409765 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - name: vcenter.host.cpu.utilization - unit: '%' - - description: The amount of memory the host system is using. - name: vcenter.host.memory.usage + - asInt: "9000" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{shares}" + - description: The amount of shares of memory in the resource pool. + name: vcenter.resource_pool.memory.shares sum: aggregationTemporality: 2 dataPoints: - - asInt: "1404" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: MiBy - - description: The percentage of the host system's memory capacity that is being utilized. - gauge: - dataPoints: - - asDouble: 34.285714285714285 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - name: vcenter.host.memory.utilization - unit: '%' + - asInt: "9000" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{shares}" scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: - - key: vcenter.host.name + - key: vcenter.resource_pool.name value: - stringValue: DC0_C0_H1 - - key: vcenter.cluster.name + stringValue: Resources + - key: vcenter.resource_pool.inventory_path value: - stringValue: DC0_C0 + stringValue: /DC0/host/DC0_C0/Resources scopeMetrics: - metrics: - - description: The amount of CPU used by the host. - name: vcenter.host.cpu.usage + - description: The amount of shares of CPU in the resource pool. + name: vcenter.resource_pool.cpu.shares sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: MHz - - description: The CPU utilization of the host system. - gauge: - dataPoints: - - asDouble: 1.4603312990409765 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - name: vcenter.host.cpu.utilization - unit: '%' - - description: The amount of memory the host system is using. - name: vcenter.host.memory.usage + - asInt: "9000" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{shares}" + - description: The amount of shares of memory in the resource pool. + name: vcenter.resource_pool.memory.shares sum: aggregationTemporality: 2 dataPoints: - - asInt: "1404" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: MiBy - - description: The percentage of the host system's memory capacity that is being utilized. - gauge: - dataPoints: - - asDouble: 34.285714285714285 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - name: vcenter.host.memory.utilization - unit: '%' + - asInt: "9000" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{shares}" scope: name: otelcol/vcenterreceiver version: latest @@ -97,10 +65,10 @@ resourceMetrics: attributes: - key: vcenter.host.name value: - stringValue: DC0_C0_H2 + stringValue: DC0_H0 - key: vcenter.cluster.name value: - stringValue: DC0_C0 + stringValue: DC0_H0 scopeMetrics: - metrics: - description: The amount of CPU used by the host. @@ -109,42 +77,39 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 1.4603312990409765 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.host.cpu.utilization - unit: '%' + unit: "%" - description: The amount of memory the host system is using. name: vcenter.host.memory.usage sum: aggregationTemporality: 2 dataPoints: - asInt: "1404" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The percentage of the host system's memory capacity that is being utilized. gauge: dataPoints: - asDouble: 34.285714285714285 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.host.memory.utilization - unit: '%' + unit: "%" scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: - - key: vcenter.cluster.name - value: - stringValue: DC0_C0 - key: vcenter.datastore.name value: stringValue: LocalDS_0 @@ -160,24 +125,24 @@ resourceMetrics: - key: disk_state value: stringValue: used - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - - asInt: "10995116277760" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + - asInt: "10952166604800" attributes: - key: disk_state value: stringValue: available - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The utilization of the datastore. gauge: dataPoints: - asDouble: 0.390625 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.datastore.disk.utilization - unit: '%' + unit: "%" scope: name: otelcol/vcenterreceiver version: latest @@ -189,9 +154,12 @@ resourceMetrics: - key: vcenter.vm.id value: stringValue: b4689bed-97f0-5bcd-8a4c-07477cc8f06f - - key: vcenter.cluster.name + - key: vcenter.resource_pool.name value: - stringValue: DC0_C0 + stringValue: Resources + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_H0/Resources - key: vcenter.host.name value: stringValue: DC0_H0 @@ -207,32 +175,32 @@ resourceMetrics: - key: disk_state value: stringValue: used - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "10737418240" attributes: - key: disk_state value: stringValue: available - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.vm.disk.utilization - unit: '%' + unit: "%" - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -240,8 +208,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -249,8 +217,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -258,8 +226,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -272,9 +240,12 @@ resourceMetrics: - key: vcenter.vm.id value: stringValue: 12f8928d-f144-5c57-89db-dd2d0902c9fa - - key: vcenter.cluster.name + - key: vcenter.resource_pool.name value: - stringValue: DC0_C0 + stringValue: Resources + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_H0/Resources - key: vcenter.host.name value: stringValue: DC0_H0 @@ -290,32 +261,32 @@ resourceMetrics: - key: disk_state value: stringValue: used - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "10737418240" attributes: - key: disk_state value: stringValue: available - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.vm.disk.utilization - unit: '%' + unit: "%" - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -323,8 +294,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -332,8 +303,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -341,9 +312,191 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MiBy + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.host.name + value: + stringValue: DC0_C0_H0 + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 + scopeMetrics: + - metrics: + - description: The amount of CPU used by the host. + name: vcenter.host.cpu.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "67" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MHz + - description: The CPU utilization of the host system. + gauge: + dataPoints: + - asDouble: 1.4603312990409765 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.cpu.utilization + unit: "%" + - description: The amount of memory the host system is using. + name: vcenter.host.memory.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1404" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy + - description: The percentage of the host system's memory capacity that is being utilized. + gauge: + dataPoints: + - asDouble: 34.285714285714285 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.memory.utilization + unit: "%" + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.host.name + value: + stringValue: DC0_C0_H1 + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 + scopeMetrics: + - metrics: + - description: The amount of CPU used by the host. + name: vcenter.host.cpu.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "67" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MHz + - description: The CPU utilization of the host system. + gauge: + dataPoints: + - asDouble: 1.4603312990409765 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.cpu.utilization + unit: "%" + - description: The amount of memory the host system is using. + name: vcenter.host.memory.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1404" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MiBy + - description: The percentage of the host system's memory capacity that is being utilized. + gauge: + dataPoints: + - asDouble: 34.285714285714285 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.memory.utilization + unit: "%" + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.host.name + value: + stringValue: DC0_C0_H2 + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 + scopeMetrics: + - metrics: + - description: The amount of CPU used by the host. + name: vcenter.host.cpu.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "67" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MHz + - description: The CPU utilization of the host system. + gauge: + dataPoints: + - asDouble: 1.4603312990409765 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.cpu.utilization + unit: "%" + - description: The amount of memory the host system is using. + name: vcenter.host.memory.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1404" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: MiBy + - description: The percentage of the host system's memory capacity that is being utilized. + gauge: + dataPoints: + - asDouble: 34.285714285714285 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.host.memory.utilization + unit: "%" + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 + - key: vcenter.datastore.name + value: + stringValue: LocalDS_0 + scopeMetrics: + - metrics: + - description: The amount of space in the datastore. + name: vcenter.datastore.disk.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "42949672960" + attributes: + - key: disk_state + value: + stringValue: used + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + - asInt: "10952166604800" + attributes: + - key: disk_state + value: + stringValue: available + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: By + - description: The utilization of the datastore. + gauge: + dataPoints: + - asDouble: 0.390625 + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + name: vcenter.datastore.disk.utilization + unit: "%" scope: name: otelcol/vcenterreceiver version: latest @@ -358,9 +511,15 @@ resourceMetrics: - key: vcenter.cluster.name value: stringValue: DC0_C0 + - key: vcenter.resource_pool.name + value: + stringValue: Resources + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_C0/Resources - key: vcenter.host.name value: - stringValue: DC0_C0_H1 + stringValue: DC0_C0_H0 scopeMetrics: - metrics: - description: The amount of storage space used by the virtual machine. @@ -373,32 +532,32 @@ resourceMetrics: - key: disk_state value: stringValue: used - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "10737418240" attributes: - key: disk_state value: stringValue: available - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.vm.disk.utilization - unit: '%' + unit: "%" - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -406,8 +565,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -415,8 +574,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -424,8 +583,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -441,9 +600,15 @@ resourceMetrics: - key: vcenter.cluster.name value: stringValue: DC0_C0 + - key: vcenter.resource_pool.name + value: + stringValue: Resources + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_C0/Resources - key: vcenter.host.name value: - stringValue: DC0_C0_H0 + stringValue: DC0_C0_H2 scopeMetrics: - metrics: - description: The amount of storage space used by the virtual machine. @@ -456,32 +621,32 @@ resourceMetrics: - key: disk_state value: stringValue: used - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "10737418240" attributes: - key: disk_state value: stringValue: available - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" name: vcenter.vm.disk.utilization - unit: '%' + unit: "%" - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -489,8 +654,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -498,8 +663,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -507,8 +672,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -526,18 +691,18 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6882" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{MHz}' + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{MHz}" - description: The amount of CPU available to the cluster. name: vcenter.cluster.cpu.limit sum: aggregationTemporality: 2 dataPoints: - asInt: "6882" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{MHz}' + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{MHz}" - description: The number of hosts in the cluster. name: vcenter.cluster.host.count sum: @@ -548,24 +713,24 @@ resourceMetrics: - key: effective value: boolValue: false - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "3" attributes: - key: effective value: boolValue: true - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{hosts}' + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{hosts}" - description: The effective memory of the cluster. This value excludes memory from hosts in maintenance mode or are unresponsive. name: vcenter.cluster.memory.effective sum: aggregationTemporality: 2 dataPoints: - asInt: "12883292160" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: The available memory of the cluster. name: vcenter.cluster.memory.limit @@ -573,91 +738,29 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12883292160" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" unit: By - description: the number of virtual machines in the cluster. name: vcenter.cluster.vm.count sum: aggregationTemporality: 2 dataPoints: - - asInt: "4" + - asInt: "2" attributes: - key: power_state value: stringValue: "on" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" - asInt: "0" attributes: - key: power_state value: stringValue: "off" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{virtual_machines}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_C0/Resources - scopeMetrics: - - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "9000" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{shares}' - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "9000" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{shares}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_H0/Resources - scopeMetrics: - - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "9000" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{shares}' - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "9000" - startTimeUnixNano: "1682367880520917116" - timeUnixNano: "1682367880570405002" - unit: '{shares}' + startTimeUnixNano: "1707407684042820000" + timeUnixNano: "1707407733803628000" + unit: "{virtual_machines}" scope: name: otelcol/vcenterreceiver version: latest diff --git a/receiver/vcenterreceiver/testdata/metrics/expected_without_direction.yaml b/receiver/vcenterreceiver/testdata/metrics/expected_without_direction.yaml deleted file mode 100644 index 4e573265c7bc..000000000000 --- a/receiver/vcenterreceiver/testdata/metrics/expected_without_direction.yaml +++ /dev/null @@ -1,1260 +0,0 @@ -resourceMetrics: - - resource: - attributes: - - key: vcenter.host.name - value: - stringValue: esxi-27971.cf5e88ac.australia-southeast1.gve.goog - - key: vcenter.cluster.name - value: - stringValue: Cluster - scopeMetrics: - - metrics: - - description: The amount of CPU used by the host. - name: vcenter.host.cpu.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "6107" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MHz - - description: The CPU utilization of the host system. - gauge: - dataPoints: - - asDouble: 6.542186227878476 - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - name: vcenter.host.cpu.utilization - unit: '%' - - description: The latency of reads to the host system's disk. - gauge: - dataPoints: - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "789" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "645" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "782" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - name: vcenter.host.disk.latency.avg.read - unit: ms - - description: The latency of writes to the host system's disk. - gauge: - dataPoints: - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "789" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "645" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "782" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - name: vcenter.host.disk.latency.avg.write - unit: ms - - description: Highest latency value across all disks used by the host. - gauge: - dataPoints: - - asInt: "899" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "899" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "905" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "1000" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "1002" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - name: vcenter.host.disk.latency.max - unit: ms - - description: Average number of kilobytes read from the disk each second. - name: vcenter.host.disk.throughput.read - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "2" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "1" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "7" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "4" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "2" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "28" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "45" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "88" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "92" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "31" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "4" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "1" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "2" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "6" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "6" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "4" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "8" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "19" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "1" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "4" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "25" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "76" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "63" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "5" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "10" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "5" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "7" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "6" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "2" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "2" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{KiBy/s}' - - description: Average number of kilobytes written to the disk each second. - name: vcenter.host.disk.throughput.write - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "789" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "645" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "781" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "782" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{KiBy/s}' - - description: The amount of memory the host system is using. - name: vcenter.host.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "140833" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MiBy - - description: The percentage of the host system's memory capacity that is being utilized. - gauge: - dataPoints: - - asDouble: 17.948557824655133 - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - name: vcenter.host.memory.utilization - unit: '%' - - description: The number of packets transmitted, as measured over the most recent 20s interval. - name: vcenter.host.network.packet.count.transmit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "40810" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "41703" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "42960" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "42206" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "41480" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "11182" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "13009" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "16489" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "12398" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "12984" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "51992" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "54712" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "59449" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "54604" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "54464" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{packets/sec}' - - description: The number of packets received, as measured over the most recent 20s interval. - name: vcenter.host.network.packet.count.receive - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "42110" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "42686" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "44277" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "43122" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "42703" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "13316" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "14473" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "19662" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "15478" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "14458" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "116" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "114" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "113" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "112" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "120" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "55647" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "57376" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "64156" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "58814" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "57390" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "105" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "103" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "104" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "102" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "109" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{packets/sec}' - - description: The summation of transmit packet errors on the host network. - name: vcenter.host.network.packet.errors.transmit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{errors}' - - description: The summation of receive packet errors on the host network. - name: vcenter.host.network.packet.errors.receive - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{errors}' - - description: The amount of data that was transmitted over the network by the host. - name: vcenter.host.network.throughput.transmit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "411" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "422" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "551" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "617" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "488" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "3064" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "2537" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "4373" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "3746" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "2569" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "3475" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "2959" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "4924" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "4364" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "3058" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{KiBy/s}' - - description: The amount of data that was received over the network by the host. - name: vcenter.host.network.throughput.receive - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "928" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "1120" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "1646" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "1291" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "1058" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "570" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "768" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "1269" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "927" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "681" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "357" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "351" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "376" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "363" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "376" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{KiBy/s}' - - description: The sum of the data transmitted and received for all the NIC instances of the host. - name: vcenter.host.network.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "769" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "773" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "927" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "980" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "864" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "3634" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "3305" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "5642" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "4674" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "3251" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - - asInt: "4404" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808280000000000" - - asInt: "4079" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808300000000000" - - asInt: "6570" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808320000000000" - - asInt: "5655" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808340000000000" - - asInt: "4117" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652808360000000000" - unit: '{KiBy/s}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.datastore.name - value: - stringValue: vsanDatastore - - key: vcenter.cluster.name - value: - stringValue: Cluster - scopeMetrics: - - metrics: - - description: The amount of space in the datastore. - name: vcenter.datastore.disk.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "5917763748696" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - - asInt: "57611315257344" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: By - - description: The utilization of the datastore. - gauge: - dataPoints: - - asDouble: 10.271877533539964 - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - name: vcenter.datastore.disk.utilization - unit: '%' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.vm.name - value: - stringValue: CentOS 7 - - key: vcenter.vm.id - value: - stringValue: 5000bbe0-993e-5813-c56a-198eaa62fb61 - - key: vcenter.cluster.name - value: - stringValue: Cluster - - key: vcenter.host.name - value: - stringValue: esxi-27971.cf5e88ac.australia-southeast1.gve.goog - scopeMetrics: - - metrics: - - description: The latency of writes to the virtual machine's disk. - gauge: - dataPoints: - - asInt: "0" - attributes: - - key: disk_type - value: - stringValue: virtual - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - name: vcenter.vm.disk.latency.avg.write - unit: ms - - description: The latency of reads to the virtual machine's disk. - gauge: - dataPoints: - - asInt: "0" - attributes: - - key: disk_type - value: - stringValue: virtual - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - name: vcenter.vm.disk.latency.avg.read - unit: ms - - description: The highest reported total latency (device and kernel times) over an interval of 20 seconds. - gauge: - dataPoints: - - asInt: "899" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - name: vcenter.vm.disk.latency.max - unit: ms - - description: The amount of storage space used by the virtual machine. - name: vcenter.vm.disk.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "16311648256" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - - asInt: "258847277056" - attributes: - - key: disk_state - value: - stringValue: available - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: By - - description: The utilization of storage on the virtual machine. - gauge: - dataPoints: - - asDouble: 5.9280825572001286 - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - name: vcenter.vm.disk.utilization - unit: '%' - - description: The amount of memory that is ballooned due to virtualization. - name: vcenter.vm.memory.ballooned - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MiBy - - description: The amount of memory that is used by the virtual machine. - name: vcenter.vm.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "163" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MiBy - - description: The amount of memory swapped to fast disk device such as SSD. - name: vcenter.vm.memory.swapped_ssd - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: KiBy - - description: The portion of memory that is granted to this VM from the host's swap space. - name: vcenter.vm.memory.swapped - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MiBy - - description: The amount of packets that was transmitted over the instance's network. - name: vcenter.vm.network.packet.count.transmit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - unit: '{packets/sec}' - - description: The amount of packets that was received over the instance's network. - name: vcenter.vm.network.packet.count.receive - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - unit: '{packets/sec}' - - description: The amount of data that was received over the network of the virtual machine. - name: vcenter.vm.network.throughput.receive - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - unit: By/sec - - description: The amount of data that was transmitted over the network of the virtual machine. - name: vcenter.vm.network.throughput.transmit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - unit: By/sec - - description: The network utilization combined transmit and receive rates during an interval. - name: vcenter.vm.network.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - - asInt: "0" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1652798360000000000" - unit: '{KiBy/s}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.cluster.name - value: - stringValue: Cluster - scopeMetrics: - - metrics: - - description: The effective CPU available to the cluster. This value excludes CPU from hosts in maintenance mode or are unresponsive. - name: vcenter.cluster.cpu.effective - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "252846" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{MHz}' - - description: The amount of CPU available to the cluster. - name: vcenter.cluster.cpu.limit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "280044" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{MHz}' - - description: The number of hosts in the cluster. - name: vcenter.cluster.host.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: effective - value: - boolValue: false - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - - asInt: "3" - attributes: - - key: effective - value: - boolValue: true - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{hosts}' - - description: The effective memory of the cluster. This value excludes memory from hosts in maintenance mode or are unresponsive. - name: vcenter.cluster.memory.effective - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "2140347" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: By - - description: The available memory of the cluster. - name: vcenter.cluster.memory.limit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "2468289376256" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: By - - description: the number of virtual machines in the cluster. - name: vcenter.cluster.vm.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "1" - attributes: - - key: power_state - value: - stringValue: "on" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - - asInt: "0" - attributes: - - key: power_state - value: - stringValue: "off" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{virtual_machines}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.resource_pool.name - value: - stringValue: Resources - scopeMetrics: - - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "4000" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{shares}' - - description: The usage of the CPU used by the resource pool. - name: vcenter.resource_pool.cpu.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "13791" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{MHz}' - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "163840" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: '{shares}' - - description: The usage of the memory by the resource pool. - name: vcenter.resource_pool.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "40543" - startTimeUnixNano: "1653335619966318000" - timeUnixNano: "1653335619974183000" - unit: MiBy - scope: - name: otelcol/vcenterreceiver - version: latest diff --git a/receiver/vcenterreceiver/testdata/metrics/expected_without_objects.yaml b/receiver/vcenterreceiver/testdata/metrics/expected_without_objects.yaml deleted file mode 100644 index f02491ac4f4c..000000000000 --- a/receiver/vcenterreceiver/testdata/metrics/expected_without_objects.yaml +++ /dev/null @@ -1,2196 +0,0 @@ -resourceMetrics: - - resource: - attributes: - - key: vcenter.cluster.name - value: - stringValue: Cluster - scopeMetrics: - - metrics: - - description: The effective CPU available to the cluster. This value excludes CPU from hosts in maintenance mode or are unresponsive. - name: vcenter.cluster.cpu.effective - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "252846" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{MHz}' - - description: The amount of CPU available to the cluster. - name: vcenter.cluster.cpu.limit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "280044" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{MHz}' - - description: The number of hosts in the cluster. - name: vcenter.cluster.host.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: effective - value: - boolValue: false - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - - asInt: "3" - attributes: - - key: effective - value: - boolValue: true - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{hosts}' - - description: The effective memory of the cluster. This value excludes memory from hosts in maintenance mode or are unresponsive. - name: vcenter.cluster.memory.effective - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "2140347" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: By - - description: The available memory of the cluster. - name: vcenter.cluster.memory.limit - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "2468289376256" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: By - - description: the number of virtual machines in the cluster. - name: vcenter.cluster.vm.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: power_state - value: - stringValue: "off" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - - asInt: "1" - attributes: - - key: power_state - value: - stringValue: "on" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{virtual_machines}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.cluster.name - value: - stringValue: Cluster - - key: vcenter.datastore.name - value: - stringValue: vsanDatastore - scopeMetrics: - - metrics: - - description: The amount of space in the datastore. - name: vcenter.datastore.disk.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "51693551508648" - attributes: - - key: disk_state - value: - stringValue: available - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - - asInt: "5917763748696" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: By - - description: The utilization of the datastore. - gauge: - dataPoints: - - asDouble: 10.271877533539964 - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: vcenter.datastore.disk.utilization - unit: '%' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.cluster.name - value: - stringValue: Cluster - - key: vcenter.host.name - value: - stringValue: esxi-27971.cf5e88ac.australia-southeast1.gve.goog - scopeMetrics: - - metrics: - - description: The amount of CPU used by the host. - name: vcenter.host.cpu.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "6107" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MHz - - description: The CPU utilization of the host system. - gauge: - dataPoints: - - asDouble: 6.542186227878476 - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: vcenter.host.cpu.utilization - unit: '%' - - description: The latency of operations to the host system's disk. - gauge: - dataPoints: - - asInt: "781" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "789" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "645" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "781" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "782" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "781" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "789" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "645" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "781" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "782" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - name: vcenter.host.disk.latency.avg - unit: ms - - description: Highest latency value across all disks used by the host. - gauge: - dataPoints: - - asInt: "899" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "899" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "905" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "1000" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "1002" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - name: vcenter.host.disk.latency.max - unit: ms - - description: Average number of kilobytes read from or written to the disk each second. - name: vcenter.host.disk.throughput - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "2" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "1" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "7" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "4" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "2" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "28" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "45" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "88" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "92" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "31" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "4" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "1" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "2" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "6" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "6" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "4" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "8" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "19" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "1" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "4" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "25" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "76" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "63" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "5" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "10" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "5" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "7" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "6" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "2" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "2" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "781" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "789" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "645" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "781" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "782" - attributes: - - key: direction - value: - stringValue: write - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - unit: '{KiBy/s}' - - description: The amount of memory the host system is using. - name: vcenter.host.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "140833" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MiBy - - description: The percentage of the host system's memory capacity that is being utilized. - gauge: - dataPoints: - - asDouble: 17.948557824655133 - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: vcenter.host.memory.utilization - unit: '%' - - description: The number of packets transmitted and received, as measured over the most recent 20s interval. - name: vcenter.host.network.packet.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "42110" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "42686" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "44277" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "43122" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "42703" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "13316" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "14473" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "19662" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "15478" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "14458" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "116" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "114" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "113" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "112" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "120" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "55647" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "57376" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "64156" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "58814" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "57390" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "105" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "103" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "104" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "102" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "109" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "40810" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "41703" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "42960" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "42206" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "41480" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "11182" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "13009" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "16489" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "12398" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "12984" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "51992" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "54712" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "59449" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "54604" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "54464" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - unit: '{packets/sec}' - - description: The summation of packet errors on the host network. - name: vcenter.host.network.packet.errors - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - unit: '{errors}' - - description: The amount of data that was transmitted or received over the network by the host. - name: vcenter.host.network.throughput - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "928" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "1120" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "1646" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "1291" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "1058" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "570" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "768" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "1269" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "927" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "681" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "357" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "351" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "376" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "363" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "376" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "411" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "422" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "551" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "617" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "488" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "3064" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "2537" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "4373" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "3746" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "2569" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "3475" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "2959" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "4924" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "4364" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "3058" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - unit: '{KiBy/s}' - - description: The sum of the data transmitted and received for all the NIC instances of the host. - name: vcenter.host.network.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "769" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "773" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "927" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "980" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "864" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "0" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "3634" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "3305" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "5642" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "4674" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "3251" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - - asInt: "4404" - startTimeUnixNano: "6000000" - timeUnixNano: "1000000" - - asInt: "4079" - startTimeUnixNano: "6000000" - timeUnixNano: "2000000" - - asInt: "6570" - startTimeUnixNano: "6000000" - timeUnixNano: "3000000" - - asInt: "5655" - startTimeUnixNano: "6000000" - timeUnixNano: "4000000" - - asInt: "4117" - startTimeUnixNano: "6000000" - timeUnixNano: "5000000" - unit: '{KiBy/s}' - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /Datacenter/host/Cluster/Resources - - key: vcenter.resource_pool.name - value: - stringValue: Resources - scopeMetrics: - - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "4000" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{shares}' - - description: The usage of the CPU used by the resource pool. - name: vcenter.resource_pool.cpu.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "13791" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{MHz}' - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "163840" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: '{shares}' - - description: The usage of the memory by the resource pool. - name: vcenter.resource_pool.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "40543" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MiBy - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.cluster.name - value: - stringValue: Cluster - - key: vcenter.host.name - value: - stringValue: esxi-27971.cf5e88ac.australia-southeast1.gve.goog - - key: vcenter.vm.id - value: - stringValue: 5000bbe0-993e-5813-c56a-198eaa62fb61 - - key: vcenter.vm.name - value: - stringValue: CentOS 7 - scopeMetrics: - - metrics: - - description: The amount of CPU used by the VM. - name: vcenter.vm.cpu.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "12" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MHz - - description: The CPU utilization of the VM. - gauge: - dataPoints: - - asDouble: 0.11569610489780177 - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: vcenter.vm.cpu.utilization - unit: '%' - - description: The latency of operations to the virtual machine's disk. - gauge: - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: read - - key: disk_type - value: - stringValue: virtual - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: write - - key: disk_type - value: - stringValue: virtual - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - name: vcenter.vm.disk.latency.avg - unit: ms - - description: The highest reported total latency (device and kernel times) over an interval of 20 seconds. - gauge: - dataPoints: - - asInt: "899" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - name: vcenter.vm.disk.latency.max - unit: ms - - description: The amount of storage space used by the virtual machine. - name: vcenter.vm.disk.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "258847277056" - attributes: - - key: disk_state - value: - stringValue: available - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - - asInt: "16311648256" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: By - - description: The utilization of storage on the virtual machine. - gauge: - dataPoints: - - asDouble: 5.9280825572001286 - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - name: vcenter.vm.disk.utilization - unit: '%' - - description: The amount of memory that is ballooned due to virtualization. - name: vcenter.vm.memory.ballooned - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MiBy - - description: The portion of memory that is granted to this VM from the host's swap space. - name: vcenter.vm.memory.swapped - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MiBy - - description: The amount of memory swapped to fast disk device such as SSD. - name: vcenter.vm.memory.swapped_ssd - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: KiBy - - description: The amount of memory that is used by the virtual machine. - name: vcenter.vm.memory.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "163" - startTimeUnixNano: "1000000" - timeUnixNano: "2000000" - unit: MiBy - - description: The amount of packets that was received or transmitted over the instance's network. - name: vcenter.vm.network.packet.count - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - unit: '{packets/sec}' - - description: The amount of data that was transmitted or received over the network of the virtual machine. - name: vcenter.vm.network.throughput - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: received - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - attributes: - - key: direction - value: - stringValue: transmitted - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - unit: By/sec - - description: The network utilization combined transmit and receive rates during an interval. - name: vcenter.vm.network.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - - asInt: "0" - startTimeUnixNano: "2000000" - timeUnixNano: "1000000" - unit: '{KiBy/s}' - scope: - name: otelcol/vcenterreceiver - version: latest diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 9e2831deb28f..3023b28b3d60 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -41,9 +42,9 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -54,7 +55,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 43bbce04bbaf..bc1b949d29a5 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -64,24 +66,24 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -133,8 +135,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/wavefrontreceiver/receiver.go b/receiver/wavefrontreceiver/receiver.go index 35e60ff3b51c..0538eb567ee6 100644 --- a/receiver/wavefrontreceiver/receiver.go +++ b/receiver/wavefrontreceiver/receiver.go @@ -44,7 +44,7 @@ func (r *metricsReceiver) Start(ctx context.Context, host component.Host) error carbonCfg := &carbonreceiver.Config{ AddrConfig: confignet.AddrConfig{ Endpoint: r.cfg.Endpoint, - Transport: "tcp", + Transport: confignet.TransportTypeTCP, }, TCPIdleTimeout: r.cfg.TCPIdleTimeout, Parser: &protocol.Config{ diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index d74917c69eec..d666450750bb 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.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -31,6 +31,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -46,16 +47,16 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -65,7 +66,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index da281130682f..f27c1c2cd1c3 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -27,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -76,38 +78,38 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -161,8 +163,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 85b01ed0a5f4..2b03f0ebcc8b 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -27,6 +27,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -44,11 +45,11 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -57,9 +58,9 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 56224eb2edc2..98847917285a 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -26,6 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= @@ -79,24 +81,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -119,8 +121,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/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/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= 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= @@ -162,12 +164,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/windowsperfcountersreceiver/config.go b/receiver/windowsperfcountersreceiver/config.go index 2b1a49e35448..2a62fdaef01d 100644 --- a/receiver/windowsperfcountersreceiver/config.go +++ b/receiver/windowsperfcountersreceiver/config.go @@ -12,7 +12,7 @@ import ( // Config defines configuration for WindowsPerfCounters receiver. type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` MetricMetaData map[string]MetricConfig `mapstructure:"metrics"` PerfCounters []ObjectConfig `mapstructure:"perfcounters"` diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 9a6da4959719..6f5242b7ea2a 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 30 * time.Second, InitialDelay: time.Second, }, @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "nometrics"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -113,7 +113,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "nometricspecified"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -135,7 +135,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "summetric"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "unspecifiedmetrictype"), expected: &Config{ - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 60 * time.Second, InitialDelay: time.Second, }, diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 37c79195d91f..125e49c41bf4 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -24,6 +24,6 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { return &Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), + ControllerConfig: scraperhelper.NewDefaultControllerConfig(), } } diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index f773e6c11512..974ef60a032f 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -35,7 +35,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &oCfg.ScraperControllerSettings, + &oCfg.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp), diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 52d71d6ebe84..005176120497 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.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -28,6 +28,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.6.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 @@ -42,8 +43,8 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -52,7 +53,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index a72d6adb5dc2..ae323ea7283f 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -21,6 +21,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= @@ -62,20 +64,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -127,8 +129,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index 181debcf22a2..e30192a2830c 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -90,7 +90,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { {Object: "Processor", Instances: []string{"*"}, Counters: []CounterConfig{{Name: "% Idle Time", MetricRep: MetricRep{Name: "cpu.idle"}}}}, {Object: "Processor", Instances: []string{"1", "2"}, Counters: []CounterConfig{{Name: "% Processor Time", MetricRep: MetricRep{Name: "processor.time"}}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "standard.yaml"), }, @@ -107,7 +107,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { PerfCounters: []ObjectConfig{ {Object: "Memory", Counters: []CounterConfig{{Name: "Committed Bytes", MetricRep: MetricRep{Name: "bytes.committed"}}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "sum_metric.yaml"), }, @@ -117,7 +117,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { PerfCounters: []ObjectConfig{ {Object: "Memory", Counters: []CounterConfig{{Name: "Committed Bytes"}}}, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, expectedMetricPath: filepath.Join("testdata", "scraper", "no_metric_def.yaml"), }, @@ -134,7 +134,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { Counters: []CounterConfig{{Name: "Invalid Counter", MetricRep: MetricRep{Name: "invalid"}}}, }, }, - ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: time.Minute, InitialDelay: time.Second}, + ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: time.Minute, InitialDelay: time.Second}, }, startMessage: "some performance counters could not be initialized", startErr: "failed to create perf counter with path \\Invalid Object\\Invalid Counter: The specified object was not found on the computer.\r\n", diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 1f05bfac1a1f..0e4dacee5a68 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -3,19 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkin go 1.21 require ( - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -35,6 +35,7 @@ require ( 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/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -48,19 +49,19 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -72,7 +73,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index c0c9ffab0d06..bb4acfc68a5b 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -30,10 +30,12 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -68,8 +70,8 @@ github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7km github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= 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= @@ -82,40 +84,40 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= @@ -169,8 +171,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 6ca40f7aed55..c525f7305e10 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -57,10 +57,6 @@ var _ http.Handler = (*zipkinReceiver)(nil) // newReceiver creates a new zipkinReceiver reference. func newReceiver(config *Config, nextConsumer consumer.Traces, settings receiver.CreateSettings) (*zipkinReceiver, error) { - if nextConsumer == nil { - return nil, component.ErrNilNextConsumer - } - transports := []string{receiverTransportV1Thrift, receiverTransportV1JSON, receiverTransportV2JSON, receiverTransportV2PROTO} obsrecvrs := make(map[string]*receiverhelper.ObsReport) for _, transport := range transports { diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index 0bd42b26dbef..65776fa6eb72 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confignet.TCPAddrConfig `mapstructure:",squash"` - metadata.MetricsBuilderConfig `mapstructure:",squash"` + scraperhelper.ControllerConfig `mapstructure:",squash"` + confignet.TCPAddrConfig `mapstructure:",squash"` + metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 3778e274ca75..bc01373b0da5 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -32,12 +32,12 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { - cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) + cfg := scraperhelper.NewDefaultControllerConfig() cfg.CollectionInterval = defaultCollectionInterval cfg.Timeout = defaultTimeout return &Config{ - ScraperControllerSettings: cfg, + ControllerConfig: cfg, TCPAddrConfig: confignet.TCPAddrConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, @@ -68,7 +68,7 @@ func createMetricsReceiver( } return scraperhelper.NewScraperControllerReceiver( - &rConfig.ScraperControllerSettings, + &rConfig.ControllerConfig, params, consumer, scraperhelper.AddScraper(scrp), diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 0fbfa20c2c91..2a302cb735ca 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.96.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 go.uber.org/goleak v1.3.0 @@ -72,15 +72,15 @@ require ( github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // 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.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect @@ -93,7 +93,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 9c0a30dfffaa..c2389bbf3e4a 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k 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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= 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= @@ -142,26 +142,26 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ= @@ -209,7 +209,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -230,8 +229,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/renovate.json b/renovate.json index a5555290314b..ef51216a5e9f 100644 --- a/renovate.json +++ b/renovate.json @@ -64,8 +64,13 @@ }, { "matchManagers": ["gomod"], - "matchSourceUrlPrefixes": ["https://golang.org"], - "groupName": "All golang.org packages" + "matchSourceUrlPrefixes": ["https://golang.org/x"], + "groupName": "All golang.org/x packages" + }, + { + "matchManagers": ["gomod"], + "matchSourceUrlPrefixes": ["https://go.opentelemetry.io/build-tools"], + "groupName": "All go.opentelemetry.io/build-tools packages" }, { "matchManagers": ["gomod"], diff --git a/testbed/datareceivers/jaeger.go b/testbed/datareceivers/jaeger.go index baaddaf9b1bc..a195a7535138 100644 --- a/testbed/datareceivers/jaeger.go +++ b/testbed/datareceivers/jaeger.go @@ -34,7 +34,7 @@ func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ co factory := jaegerreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*jaegerreceiver.Config) cfg.Protocols.GRPC = &configgrpc.ServerConfig{ - NetAddr: confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: "tcp"}, + NetAddr: confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: confignet.TransportTypeTCP}, } var err error set := receivertest.NewNopCreateSettings() diff --git a/testbed/datareceivers/opencensus.go b/testbed/datareceivers/opencensus.go index c945e587930b..0302d1a786e2 100644 --- a/testbed/datareceivers/opencensus.go +++ b/testbed/datareceivers/opencensus.go @@ -33,7 +33,7 @@ func NewOCDataReceiver(port int) testbed.DataReceiver { func (or *ocDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { factory := opencensusreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*opencensusreceiver.Config) - cfg.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", or.Port), Transport: "tcp"} + cfg.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", or.Port), Transport: confignet.TransportTypeTCP} var err error set := receivertest.NewNopCreateSettings() if or.traceReceiver, err = factory.CreateTracesReceiver(context.Background(), set, cfg, tc); err != nil { diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index 39f380c5a704..5de7c6d5616b 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -98,7 +98,7 @@ func (cfg *jaegerConfig) Validate() error { func (je *jaegerGRPCDataSender) newTracesExporter(set exporter.CreateSettings) (exporter.Traces, error) { cfg := jaegerConfig{} cfg.Endpoint = je.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } diff --git a/testbed/datasenders/opencensus.go b/testbed/datasenders/opencensus.go index bbaca7339179..458938518e76 100644 --- a/testbed/datasenders/opencensus.go +++ b/testbed/datasenders/opencensus.go @@ -23,7 +23,7 @@ type ocDataSender struct { func (ods *ocDataSender) fillConfig(cfg *opencensusexporter.Config) *opencensusexporter.Config { cfg.Endpoint = ods.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } return cfg diff --git a/testbed/go.mod b/testbed/go.mod index 9279f208c77e..2c8e6ef38574 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/fluent/fluent-logger-golang v1.9.0 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.96.0 @@ -29,40 +29,40 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter v0.96.0 - github.com/prometheus/common v0.48.0 + github.com/prometheus/common v0.50.0 github.com/prometheus/prometheus v0.48.1 github.com/shirou/gopsutil/v3 v3.24.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c - go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/text v0.14.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 ) require ( @@ -80,7 +80,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.50.2 // indirect + github.com/aws/aws-sdk-go v1.50.17 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -117,7 +117,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -214,22 +214,22 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.49.0 // indirect @@ -253,12 +253,12 @@ require ( golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.22.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.16.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.150.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index c69f341fe8a5..a0265eaf9000 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -90,8 +90,8 @@ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.50.2 h1:/vS+Uhv2FPcqcTxBmgT3tvvN5q6pMAKu6QXltgXlGgo= -github.com/aws/aws-sdk-go v1.50.2/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.17 h1:KsbzUKDgGNlkDHGvoQDhiJ63a9jtZd+O+/s3pTOr/ns= +github.com/aws/aws-sdk-go v1.50.17/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -245,8 +245,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -377,8 +377,8 @@ github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2Wi github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4/go.mod h1:1yEQhaLb/cETXCqQmdh7lDjupNAReO7c83AHyK2dJ48= github.com/ionos-cloud/sdk-go/v6 v6.1.9 h1:Iq3VIXzeEbc8EbButuACgfLMiY5TPVWUPNrF+Vsddo4= github.com/ionos-cloud/sdk-go/v6 v6.1.9/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -545,8 +545,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -665,88 +665,88 @@ 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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a h1:GI68MArUlpk59/WT44t438Jtxsy/CjsQFzaY0bmyKLM= -go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:fahTzQJV8hJK5eB7gcHzeiIqkNco8aIlDp87d2swD+Y= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a h1:I7AZzjc7NJ/0lbtlqfaVDThblUIkIdBLEVPimaYwoA0= -go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a h1:00bVNdy8YitPPBJRMee+DFEd907G9aReMaupYgDoAiA= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:rUBj5CE74VmjvQRKA7IxBE+jXhdLsc2yUWAdS0ifmeA= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:bzianbaJRqx1Yj7nzwk4/fhz1XXLhPT2M9mrlcWPc7k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:gAS6BTuUnRVPyCcfCpEz2EWJSIBg1lYbLZ/URYMBnwU= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:wfBjaQU3K1KAdE0kQcLt38fkVfj9awU5PjFR51QVQHg= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a h1:uxsLmeJjQ5gDR2MXopKe0AxGUGH7UApqwOHd3sY1f+g= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a h1:kkuguOL25vQx0u9JNWMlXVSFW7u/qFkosjWhZOWVVU8= -go.opentelemetry.io/collector/connector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:aBwrRIvfo5WRAMFr/k/VdH051OAXucQIe2eWoW4jHEA= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:NeW29xMY8vSpywaTlujNYkTte2YXUD2jXZpwSrMRnuc= -go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4R1xrKFwrNoDUFxF1XMNX7DEBvy7j7yYo8oCT5GI5pY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:LUujxbjDxjw2He26uDdgbkIW3RqYVd3HVPOqKM6jvbo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:XsLZAP067EJNJHQ5VELrdFBWkGwhezVmMc607YpclO8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a h1:7jHwA6IoBYR8p5ltqNm/hZUMgXHeL3Y8hXjsTe0XN+8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:cwNkIhOcU9ltYj7Xrrn9/6+j6XZC8hMZcXU8/J0DzeE= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a h1:4uN68N5k2JQkGJm2P1NHlX3rSWBAnpBpO03xO6dy58k= -go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:te/gJxX/rw7VYnXxmV4qjUv8YYeL1YNCAxgAI92sZoU= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a h1:3idLe4piHkcyEb6j7XyDfSxmScI0nhe5O/Wa/Molnkk= -go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:PWKLpwkarM7db/ho+fF+X8ynke3EFiXfGXdDiCmKMPw= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a h1:zSJxlGOc3DG7Ut3WQnDI4NRoRK4Rl/V8Zzd5jwekV8Y= -go.opentelemetry.io/collector/otelcol v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tdVkRThJzWKw9HqrPZpTfvSWZU79sZu/C0SUArEqi9c= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a h1:RWRXXvxulu7V9qwLwOxj9SkxbpW6ccljE+D044FwYXw= -go.opentelemetry.io/collector/processor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:tpZIZv8mNbqT6bIzNSMFx/0JpGJBxyEbbI1kn2IUf2Y= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:9b6sdBOTF3+fHQxuwL6HaP2sq1h0uCKVHU/iriuIhrE= -go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ogvsrUCWiZT3L9bomot/N1s3PE5uGPZPcuna3/ZKhu8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a h1:deN27eMzUCn9TFxw6gnu3eN4C9Gn6qQPFjzS3xKMe3U= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:FqvWxZhoUctvcb4MQFAS62LqoDCF+/DE0VbUOggUv9g= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a h1:nwVb2ZC1d5qvQ6fwhQ4JOMXfylRNRFn7qFEJUWTEszw= -go.opentelemetry.io/collector/receiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:oe+iRFrZP4N1+LU2NSV94hBxIvwSWdX1k5lDshjty+A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a h1:feIwR3r3oSkR0H/rJqEQhUNTPzEtz8iicVW3DfGhmNE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:Kc11B/hPc7ALoMhB7qA0FabMuvtMIR+xtLyqxCXkYIg= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a h1:dq6h7VVC+uoPlrTygd1we6UfycL12j606JcJHL67EaY= -go.opentelemetry.io/collector/semconv v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a h1:YTdeZ/hg3JYKxc7EQkblOTu72HmmUIhBZkyixFEEHSE= -go.opentelemetry.io/collector/service v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:2bMwwTGKdKNF1ErKikAnUPFDg5yWjWYuUdbjQqEzt00= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W16TJ2hPAHL7i4C7ZyxpLjGWfsAWZAQ2sxhXft1+RJM= +go.opentelemetry.io/collector/config/configgrpc v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:WXUQWIjI+lyMfRJ4TObbdhrqtbI2Jr8zjzQFh3Ej9NU= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16 h1:WttbQWOgVjLMn3oiHXisd/FVywK7HpZ7N4ZivIc/R0U= +go.opentelemetry.io/collector/config/confignet v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ckz6xu0WRPpOZo31XvhSlnFW1u3v5Ragn59DaJxlMww= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:cclvWWwWQnee1FBNnRwBah4xbNcVWlHZrLd+1wWiT50= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:RVZU8R+OtJBqzuRHMnubp7FYXShmNQYfT7swJ6H2PkQ= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:68ZLsyF4yLL5aP+zNmtETFLGRPIeHjL8oCy60gKJw3E= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:HTdJWKMRHrK9YncjwQ3bmejKjtHg/M7sPlF3bKxcG6k= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:6rrcIBYVaZYlv8dIRXr/AUPO54u19u0f+542ssx5Q50= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:si33SWxbC+bH/O/ePcPAJbmrmHKHxxBIqhVSJDgNnVw= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:scP01buAHYxcPgx9Jwoy393hjt+wP6B2mVOWpKLzYFM= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:H2TVK1cwQH6P4kBTHioMycAfbg73LIBDvUr9aQcn0as= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4/XCKH1BhhL5eBROeEaR/NDsuEcPw9nz5TfaAMVLIO0= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16 h1:MKmjCDSgbHdZopuHMxtbXR9p0zrOkpDgvckJ1y5llJ8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:C9RhlBMl4frlho31BlNYDTEPvQd3S+VXbZPL20zJH9M= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ug6Txqgd9pmYytQikk0kiBydD5gbxd6a+Md2TxQLcBk= +go.opentelemetry.io/collector/connector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:HA1j8zaiKwsZTV9A11qRuyl8hwnbm34Tl6zFFS/38zg= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:YZgI1LJKyadgOL9Bne2l2g4Vfnmq7hgCdm8IPydw8+8= +go.opentelemetry.io/collector/exporter/debugexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/RJEBFTa6pKT19ZTvHf53u866Vd+kIMXWuGNiFn8nxo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:KiVX4JtHKIvwa8qzMgu1RnZU9VV0l5WSElEavA3kI0I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:9QVTMXUj67MKDLi01gzTNm4P+UudGEZJmTl+44NOHYQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:lFag1QoqEANT3KhVfKaT3J2RFFHwH6urC+ED7uI7vmE= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vltQMVWBhsB+5oChLlE77BqlHs54RS7oq4va4Gw8vzM= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:doCbNTc6uGPoH1azKROqg21Pq71IcJM1KvvVTPfM0uE= +go.opentelemetry.io/collector/extension/ballastextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/GGESGmyy/r2zTB2ogFuxwPGNRJjbiuPY6J02QiXf2Q= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ar/lke632VUrLX6/t9mjKE6QLnt4glhCKCkQvzN5SwY= +go.opentelemetry.io/collector/extension/zpagesextension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:mz2NEu4Dba2/t6MTPOjOOTgFXrmiqPQeShmQmwxrm30= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZTwHhYdJ9TE8bgm/A1fn4c2KBI5GgRAU1zxkoFVPtmo= +go.opentelemetry.io/collector/otelcol v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:vEiWq4kffDjGrQVSnXAMKJTVOvULicKq+nI0yIyBcGs= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:dz4YEgAvfUGZAqOrlipbVjYZTK3f3XFXF7XcLjjABJ4= +go.opentelemetry.io/collector/processor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:U4KPG6ifuuuD0HJDRyxEIOQHV5ylLMTcA8corNGETXI= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Olky/5XuHBOT6HYO+TBrjRGHYD2fKPn1Y2Ufu+LdHb4= +go.opentelemetry.io/collector/processor/batchprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AB4n6Hh56Rr37Kg5yZW80r4bmU5Otlw6Rqw8K1+z2eM= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16 h1:yKLt/ROGAWZiNpOW7qo2EZc2oBbip7jGKYkmZMqIEYA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:/K3xuN63G0jXAVomCaplBonl8yaeHUgltyaNPN/hL2Y= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:rNLRTRbzRsHgsfaVzAyBG+OHAr6xiTtcTECcPhmBwP4= +go.opentelemetry.io/collector/receiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:+dCEmp1XV0a42CnBV6RcdPA5Ns6t4YCtSQsEwyLmef8= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16 h1:VT8tvgdOAoSeGdgYl6pVbJi75L7KMWBpVp3d4k9l9kE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:7eAks6XkdfKRiTXWHxAP2QxCqsfrXJVMBaEsdfzrk2I= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ZbEQ7Gu/52eIh9+tLtRbGwQtjD1yVYOXLTBF9YKXebQ= +go.opentelemetry.io/collector/semconv v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16 h1:buvEl6+igNaKfrX/7fEHegNAX3IH6yIbGV+J3geETWY= +go.opentelemetry.io/collector/service v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:sxx4V/GR8H7EsoTi+Fw5pWFEbfMgPbYFWeeb9scodwQ= go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -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/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY= @@ -883,8 +883,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1031,8 +1031,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1107,8 +1107,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod index 7884bb07ee94..deda0ac0e53d 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod @@ -5,11 +5,11 @@ go 1.21 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.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a - go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c + go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 + go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 ) require ( @@ -40,18 +40,18 @@ require ( github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c // indirect - go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a // indirect - go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c // indirect + go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 // indirect + go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect @@ -65,7 +65,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/grpc v1.62.0 // indirect + google.golang.org/grpc v1.62.1 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum index 022ec845f9e4..1fe222937ec6 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum @@ -45,6 +45,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.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= @@ -104,40 +106,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.96.1-0.20240305232712-5a68058e0e3a h1:Q+xft9nvig8Qd8/vfmnCj7n2pCJBujCN7SBhliRaBpo= -go.opentelemetry.io/collector v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:BIhfobl2CIS7CfkJmFThY3z61PgQjZB5gnWImEaRi/k= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a h1:T3AlPGKU93PO/nU7INHzs/XMeFKVrCnQVr8cEaqnSa4= -go.opentelemetry.io/collector/component v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:wllCwAet1K10W3YprOOmVlEIj3gZuKtq5csuGEKSsRg= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a h1:soZ7un0DG/nMxoZBgTnQARGQDfDc84BBNlsf+EsYtfk= -go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ixTB7k13o47Lpsq3H7tLp04t+4Rr+iCwi01MezkaxA0= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a h1:ij+cTnzj7FSW5x6mG7EOrosJABdMx7Mc//fc960MHSo= -go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a h1:aXiFJyAU4Y7VcodkhDkQWZtBoO2+q64V/PEivyLOV1E= -go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:MoKON0kZxEa52bj9iny7ehNsq4DQXIZ6MrLeQYjt3Oo= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c h1:Kw0NeFwUl6ImATLR5n6UFNtOL/V3LdNJizfZlK4RxRU= -go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a h1:yYEv2SILpJd2hkp9O9PwOW9hUFpmULZQGMfVKeEJv+o= -go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a h1:1Z6t8npum4MJwwaC26PnloiN0EPoVpikIEoNRAbX27s= -go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a h1:y0XvM8xyBY/cfLle4ZZ99GiqWhGT5TUyQeom/dolmDI= -go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a h1:3yroudOw4MTGtKlX8UdXPLPUMnSIXkOOeRdCsznnW7U= -go.opentelemetry.io/collector/config/internal v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a h1:MwWgNknZaZfQh8geP4NiehnPb2fjJNqBRionOy7B1EE= -go.opentelemetry.io/collector/confmap v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a h1:rayIzF8QSH7eMvaxCSa2IwYBTT9MC+p/MoG9UdapJKs= -go.opentelemetry.io/collector/consumer v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:K5ygOk+FRyHZfHrmiyHxQeJqfpjtmhUvqgBg+2SrKgs= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a h1:L7Xusg5XQ2L82oytMToaAqUFFHmnjzu9J0orgnjwuUU= -go.opentelemetry.io/collector/exporter v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:ZvpdTZHvtpLvWR48bO1QtK5euA9u2qp5djJXNYZc0Kg= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a h1:pK6zZcqB+W6Ni47po55HsEMHbCFeAyRVlfnTu0+U8q0= -go.opentelemetry.io/collector/extension v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:F0rGd3CSmpLqbO1mTZXAnz4Wg0Vb58SCGJKjAEuqx50= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a h1:gmXniOplOClIgdbPN8l82TL4h2yFTUS4yYcBUVWeO5c= -go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240305232712-5a68058e0e3a/go.mod h1:l4A8rMv6dFXX2gD8dp4gssGs5V9c142EYIuXL9+X8Zo= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c h1:y2dfi4xkJGFQwven4jjzv5g6Fg+rknSw45mZycadtyI= -go.opentelemetry.io/collector/featuregate v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c h1:YbP7bBLw0shCg1/WViR6WG7tinWyPk5iQXk4goIo9q0= -go.opentelemetry.io/collector/pdata v1.3.1-0.20240305230428-621d8669ec4c/go.mod h1:bH54TT52Uvac1zY5xWafax+tqrBD5xtB+Y8U4DbZ+GY= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4pMthIh6EgBDRrgqlnbal2hGPdDAADHc7C3gYU7cemc= +go.opentelemetry.io/collector v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:PFDUr160wBjUPqqVIvpJ0G9JXM8ux+qZkC+oZRB8gnA= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Is9uHOav+UViEFSyTl/I7Vk2zymZTSw9c6iBVn4/fRI= +go.opentelemetry.io/collector/component v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0evn//YPgN/5VmbbD4JS0yH3ikWxwROQN1MKEOM/U3M= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ELrVNQ2BGQxfMq1CIvALNA5Pvj47h8esuZQdXlr2w8k= +go.opentelemetry.io/collector/config/configauth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:ivhsOgauQNlgpWLEYSGE7ProeF8hbqTY/mLHhq01VRI= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16 h1:DhddNz4GsPmpyyLjBGRJ/sWBmhkVlURAEaCXjBAs/mw= +go.opentelemetry.io/collector/config/configcompression v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16 h1:PxkdSlm7FYLC33TluFL4OZAF7fw57ijzUYzqH3j+qTQ= +go.opentelemetry.io/collector/config/confighttp v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:IAayU6jxbSsvxLv4o13F5FiXqHWPQYo8trFI8gPMPl8= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16 h1:eWaIkWeTx/1zoIxfQ0gu48szlpLb6xOj6wu+ekprSHk= +go.opentelemetry.io/collector/config/configopaque v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:xhwF+gytUht4rqIeu60TA+WH7QExqCau9dI5FE6ZaDw= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:W4/bDJVoVseNnZ415rR2nGjO90F645cKgYhM2m2jR/g= +go.opentelemetry.io/collector/config/configretry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4Vi88ksIeP0NseJgnqFPvGOBwCXh4Ary6+NbF1Gi3OM= +go.opentelemetry.io/collector/config/configtelemetry v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16 h1:f+Cd8UM26tEOgcjE41VxjQglxcW4DJr8bGC4ROCnKj8= +go.opentelemetry.io/collector/config/configtls v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:4nJgllyzKMVOpcb1KIafRCnciGuuVGkQ8BqRaffupdQ= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16 h1:We6qrUH9J6fiX/hEVHDLpq9xVL/3Qrl7PpgmglU+Q2w= +go.opentelemetry.io/collector/config/internal v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0ZDYwZLmixzsIMp0F7Op9wVwRHrMp3HILhmnk/X6REg= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16 h1:as8mEhxxXrdtz4cNZyCJFtfORWeEVVDnFjhE9XNEwAA= +go.opentelemetry.io/collector/confmap v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:AnJmZcZoOLuykSXGiAf3shi11ZZk5ei4tZd9dDTTpWE= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16 h1:Ck1Ezg+WseiNj1YllgCLHLQ7urv6Y+RVXcIpXKYpLrY= +go.opentelemetry.io/collector/consumer v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:pF9K1Oty2E3Z/crgyIg55DIy7S8QXYMrcyHvARUyGIY= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16 h1:QlLavIlCvBRV6usVT0bDYmd3VYVNHnSCM9cO9oNrnVs= +go.opentelemetry.io/collector/exporter v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:qGuTdw9xT2NycZwWtahgAXJlK3rkiGbaZD6Na6s5Pzc= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16 h1:ETaJM2DKhBVMAEDexHafD+7W/HpFze7SbtYJE/w2zpY= +go.opentelemetry.io/collector/extension v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:H0IqtDdwT5WcXlikiaEB7rJTg3s9o04wNmyqRuG45PQ= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16 h1:4PXtYQGb6ExvaNrONV//eZIpzbJFf+TTEQ5gkO3Pnv4= +go.opentelemetry.io/collector/extension/auth v0.96.1-0.20240315172937-3b5aee0c7a16/go.mod h1:oSbRWTzHAJm/Lb0VoK8GJ9FBOve/CaCpHnmQZRSkTT4= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16 h1:6H0vZiRXlvvob+ejs59g6iTSat2DkuB5RCvL71lhzIg= +go.opentelemetry.io/collector/featuregate v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16 h1:xy/YN0kUeRwl6mltOlUKLobfLxRVuS6b/d1D3pdVFnU= +go.opentelemetry.io/collector/pdata v1.3.1-0.20240315172937-3b5aee0c7a16/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/receiver v0.96.0 h1:OrlcuyFCBQpbWNb2klzTdz1ZXMk0acRDh7fbaQtP4eo= go.opentelemetry.io/collector/receiver v0.96.0/go.mod h1:fb5Vr2+tAkzB4qE6+lNaMsZwaeE8qZvG3IBdzK5hCRY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= @@ -201,8 +203,8 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/testbed/testbed/receivers.go b/testbed/testbed/receivers.go index 37225fe1dc5d..faba37f87025 100644 --- a/testbed/testbed/receivers.go +++ b/testbed/testbed/receivers.go @@ -61,7 +61,7 @@ func (bor *BaseOTLPDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, factory := otlpreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*otlpreceiver.Config) if bor.exporterType == "otlp" { - cfg.GRPC.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: "tcp"} + cfg.GRPC.NetAddr = confignet.AddrConfig{Endpoint: fmt.Sprintf("127.0.0.1:%d", bor.Port), Transport: confignet.TransportTypeTCP} cfg.HTTP = nil } else { cfg.HTTP.Endpoint = fmt.Sprintf("127.0.0.1:%d", bor.Port) diff --git a/testbed/testbed/senders.go b/testbed/testbed/senders.go index 684763501004..8501f22b08f3 100644 --- a/testbed/testbed/senders.go +++ b/testbed/testbed/senders.go @@ -87,7 +87,7 @@ func (ods *otlpHTTPDataSender) fillConfig(cfg *otlphttpexporter.Config) *otlphtt cfg.RetryConfig.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueConfig.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } cfg.Compression = ods.compression @@ -219,7 +219,7 @@ func (ods *otlpDataSender) fillConfig(cfg *otlpexporter.Config) *otlpexporter.Co cfg.RetryConfig.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueConfig.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = configtls.ClientConfig{ Insecure: true, } return cfg