diff --git a/.chloggen/add-username-parameter-for-connection.yaml b/.chloggen/add-username-parameter-for-connection.yaml new file mode 100644 index 000000000000..440353da45ad --- /dev/null +++ b/.chloggen/add-username-parameter-for-connection.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: redisreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adding username parameter for connecting to redis + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24408] + +# (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: \ No newline at end of file diff --git a/.chloggen/added-temp-files-metric.yaml b/.chloggen/added-temp-files-metric.yaml new file mode 100755 index 000000000000..3a79eb7ed28b --- /dev/null +++ b/.chloggen/added-temp-files-metric.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: postgresqlreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added `postgresql.temp_files` metric. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26080] + +# (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/azuremonitorreceiver-new-attributes.yaml b/.chloggen/azuremonitorreceiver-new-attributes.yaml new file mode 100644 index 000000000000..a7e1a0d41654 --- /dev/null +++ b/.chloggen/azuremonitorreceiver-new-attributes.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: receiver/azuremonitor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added new attrbutes to the metrics like name, type and resource_group. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24774] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/.chloggen/bumpexpr.yaml b/.chloggen/bumpexpr.yaml new file mode 100755 index 000000000000..2c69d5b1d793 --- /dev/null +++ b/.chloggen/bumpexpr.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: receiver_creator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update expr and relocate breaking `type` function to `typeOf` + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26038] + +# (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/clickhouseexporter_Change_writing_of_metrics_data_to_batch.yaml b/.chloggen/clickhouseexporter_Change_writing_of_metrics_data_to_batch.yaml new file mode 100644 index 000000000000..1e539d3ec455 --- /dev/null +++ b/.chloggen/clickhouseexporter_Change_writing_of_metrics_data_to_batch.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: clickhouseexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Change writing of metrics data to batch + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24403] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/.chloggen/codeboten_rm-dupe-memcached.yaml b/.chloggen/codeboten_rm-dupe-memcached.yaml new file mode 100755 index 000000000000..5972a6150f4d --- /dev/null +++ b/.chloggen/codeboten_rm-dupe-memcached.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: memcachedreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Removes duplicate `Timeout` field. This change has no impact on end users of the component." + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26084] + +# (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: [api] diff --git a/.chloggen/codeboten_rm-dupe-podman.yaml b/.chloggen/codeboten_rm-dupe-podman.yaml new file mode 100755 index 000000000000..05595e615881 --- /dev/null +++ b/.chloggen/codeboten_rm-dupe-podman.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: podmanreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Removes duplicate `Timeout` field. This change has no impact on end users of the component." + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26083] + +# (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: [api] diff --git a/.chloggen/codeboten_rm-dupe-timeout-zookeeper.yaml b/.chloggen/codeboten_rm-dupe-timeout-zookeeper.yaml new file mode 100755 index 000000000000..c20b7a75f533 --- /dev/null +++ b/.chloggen/codeboten_rm-dupe-timeout-zookeeper.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: zookeeperreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Removes duplicate `Timeout` field. This change has no impact on end users of the component." + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26082] + +# (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: [api] diff --git a/.chloggen/deprecate-processor.yaml b/.chloggen/deprecate-processor.yaml new file mode 100755 index 000000000000..b90977b792ea --- /dev/null +++ b/.chloggen/deprecate-processor.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: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecation of Datadog processor in favor of Datadog connector + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [19740] + +# (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/deprecate-tanzu-exporter.yaml b/.chloggen/deprecate-tanzu-exporter.yaml new file mode 100755 index 000000000000..3aab4ff55250 --- /dev/null +++ b/.chloggen/deprecate-tanzu-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: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: tanzuobservabilityexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecation of Tanzu Observability (Wavefront) Exporter in favor of native OTLP ingestion. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24225] + +# (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/disable_jaeger_receiver_remote_sampling.yaml b/.chloggen/disable_jaeger_receiver_remote_sampling.yaml new file mode 100644 index 000000000000..a399ba951a8d --- /dev/null +++ b/.chloggen/disable_jaeger_receiver_remote_sampling.yaml @@ -0,0 +1,31 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: jaegerreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate remote_sampling config in the jaeger receiver + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24186] + +# (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 jaeger receiver will fail to start if remote_sampling config is specified in it. + The `receiver.jaeger.DisableRemoteSampling` feature gate can be set to let the receiver start and treat + remote_sampling config as no-op. In a future version this feature gate will be removed and the receiver will always + fail when remote_sampling config is specified. + +# 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, api] diff --git a/.chloggen/drop-histogram-metrics-first-part.yaml b/.chloggen/drop-histogram-metrics-first-part.yaml new file mode 100755 index 000000000000..3f8224b77186 --- /dev/null +++ b/.chloggen/drop-histogram-metrics-first-part.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: 'signalfxexporter' + + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: 'Added a mechanism to drop histogram buckets' + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25845] + +# (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/drosiek-journald-identifier.yaml b/.chloggen/drosiek-journald-identifier.yaml new file mode 100755 index 000000000000..21760caf0a32 --- /dev/null +++ b/.chloggen/drosiek-journald-identifier.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: journaldreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add support for identifiers + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [20295] + +# (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/drosiek-journald.yaml b/.chloggen/drosiek-journald.yaml new file mode 100755 index 000000000000..81945aa2cdfa --- /dev/null +++ b/.chloggen/drosiek-journald.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: journaldreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add support for dmesg + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [20295] + +# (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/exporter_azuremonitor_log-bug.yaml b/.chloggen/exporter_azuremonitor_log-bug.yaml new file mode 100755 index 000000000000..74aa68d9c4ca --- /dev/null +++ b/.chloggen/exporter_azuremonitor_log-bug.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: azuremonitor_logexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: The log exporter now supports non-string data for the log record body. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [23422] + +# (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_custom_port.yaml b/.chloggen/feat_custom_port.yaml new file mode 100755 index 000000000000..1ce8f9a17202 --- /dev/null +++ b/.chloggen/feat_custom_port.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: 'cassandraexporter' + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Allow custom port for Cassandra connection" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24391] + +# (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/feat_dur-to-num.yaml b/.chloggen/feat_dur-to-num.yaml new file mode 100755 index 000000000000..bb21182ea1e5 --- /dev/null +++ b/.chloggen/feat_dur-to-num.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: 'pkg/ottl' + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Add converters to covert duration to nanoseconds, microseconds, milliseconds, seconds, minutes or hours" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24686] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/.chloggen/fix-exporter-loadbalancingexporter-invalid-endpoints.yaml b/.chloggen/fix-exporter-loadbalancingexporter-invalid-endpoints.yaml new file mode 100644 index 000000000000..dcf2311d4754 --- /dev/null +++ b/.chloggen/fix-exporter-loadbalancingexporter-invalid-endpoints.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 k8s service resolver retaining invalid old endpoints + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24914] + +# (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/gmp_unit_suffixes_config.yaml b/.chloggen/gmp_unit_suffixes_config.yaml new file mode 100644 index 000000000000..74bbbc90cb51 --- /dev/null +++ b/.chloggen/gmp_unit_suffixes_config.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: googlemanagedprometheus + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add a `add_metric_suffixes` option to the googlemanagedprometheus exporter. When set to false, metric suffixes are not added. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26071] + +# (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, api] diff --git a/.chloggen/haproxy-http-support.yaml b/.chloggen/haproxy-http-support.yaml new file mode 100644 index 000000000000..c4a626399139 --- /dev/null +++ b/.chloggen/haproxy-http-support.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: haproxyreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add support for HTTP connections + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24440] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/.chloggen/kubeletstats-uptime.yaml b/.chloggen/kubeletstats-uptime.yaml new file mode 100755 index 000000000000..8420b268a157 --- /dev/null +++ b/.chloggen/kubeletstats-uptime.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: kubeletstatsreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add a new `uptime` metric for nodes, pods, and containers to track how many seconds have passed since the object started + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25867] + +# (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/opensearch-exporter-implmentation.yaml b/.chloggen/opensearch-exporter-implmentation.yaml new file mode 100644 index 000000000000..016546dcbe04 --- /dev/null +++ b/.chloggen/opensearch-exporter-implmentation.yaml @@ -0,0 +1,9 @@ +change_type: enhancement + +component: opensearchexporter + +note: implement [OpenSearch](https://opensearch.org/) exporter. + +issues: [23611] + +subtext: diff --git a/.chloggen/ottl-func-extract-pattern.yaml b/.chloggen/ottl-func-extract-pattern.yaml new file mode 100644 index 000000000000..139ced2dd51d --- /dev/null +++ b/.chloggen/ottl-func-extract-pattern.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: pkg/ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add new `ExtractPatterns` converter that extract regex pattern from string. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25834, 25856] + +# (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/ottl-len-pdata-slices-issue-25868.yaml b/.chloggen/ottl-len-pdata-slices-issue-25868.yaml new file mode 100644 index 000000000000..364758116a2d --- /dev/null +++ b/.chloggen/ottl-len-pdata-slices-issue-25868.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add support for Log, Metric and Trace Slices to `Len` converter + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25868] + +# (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: \ No newline at end of file diff --git a/.chloggen/ottl-substring-intgetter.yaml b/.chloggen/ottl-substring-intgetter.yaml new file mode 100644 index 000000000000..09803104151c --- /dev/null +++ b/.chloggen/ottl-substring-intgetter.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: pkg/ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: use IntGetter argument for Substring function + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25852] + +# (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: [api] diff --git a/.chloggen/pkg-loki-translator-add-scope-attributes.yaml b/.chloggen/pkg-loki-translator-add-scope-attributes.yaml new file mode 100644 index 000000000000..4ee8f2e19a46 --- /dev/null +++ b/.chloggen/pkg-loki-translator-add-scope-attributes.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: lokitranslator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added Attributes support to the InstrumentationScope + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24027] + +# (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/pkg-loki-translator-move-label-normalization-to-LogToLokiEntry.yaml b/.chloggen/pkg-loki-translator-move-label-normalization-to-LogToLokiEntry.yaml new file mode 100644 index 000000000000..e111c152ed74 --- /dev/null +++ b/.chloggen/pkg-loki-translator-move-label-normalization-to-LogToLokiEntry.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: lokitranslator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Public method `LogToLokiEntry` from `pkg/loki/translator` now returns normalized (`.` replaced by `_`) label names + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26093] + +# (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/pkg-stanza-deprecate-encodingconfig.yaml b/.chloggen/pkg-stanza-deprecate-encodingconfig.yaml new file mode 100755 index 000000000000..b3551aa632e9 --- /dev/null +++ b/.chloggen/pkg-stanza-deprecate-encodingconfig.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: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate 'helper.EncodingConfig' and 'helper.NewEncodingConfig' + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25846] + +# (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: [api] diff --git a/.chloggen/pkg-stanza-deprecate-encodingconfig2.yaml b/.chloggen/pkg-stanza-deprecate-encodingconfig2.yaml new file mode 100755 index 000000000000..dae7daca3e77 --- /dev/null +++ b/.chloggen/pkg-stanza-deprecate-encodingconfig2.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: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated 'helper.Encoding' and 'helper.EncodingConfig.Build' + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25846] + +# (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: [api] diff --git a/.chloggen/pkg-stanza-encoding.yaml b/.chloggen/pkg-stanza-encoding.yaml new file mode 100755 index 000000000000..3705335e22b3 --- /dev/null +++ b/.chloggen/pkg-stanza-encoding.yaml @@ -0,0 +1,31 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate encoding related elements of helper pacakge, in favor of new decoder package + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26019] + +# (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: Includes the following deprecations | + - Decoder + - NewDecoder + - LookupEncoding + - IsNop + +# 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/pkg-stanza-fileconsumer-rm-finder.yaml b/.chloggen/pkg-stanza-fileconsumer-rm-finder.yaml new file mode 100755 index 000000000000..607bfba585d2 --- /dev/null +++ b/.chloggen/pkg-stanza-fileconsumer-rm-finder.yaml @@ -0,0 +1,32 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated fileconsumer config structs + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24853] + +# (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: Includes | + - MatchingCriteria + - OrderingCriteria + - NumericSortRule + - AlphabeticalSortRule + - TimestampSortRule + +# 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/pkg-stanza-tokenize.yaml b/.chloggen/pkg-stanza-tokenize.yaml new file mode 100755 index 000000000000..85e0eb077402 --- /dev/null +++ b/.chloggen/pkg-stanza-tokenize.yaml @@ -0,0 +1,40 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate tokenization related elements of helper pacakge, in favor of new tokenize package + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25914] + +# (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: Includes the following deprecations | + - Flusher + - FlusherConfig + - NewFlusherConfig + - Multiline + - MultilineConfig + - NewMultilineConfig + - NewLineStartSplitFunc + - NewLineEndSplitFunc + - NewNewlineSplitFunc + - Splitter + - SplitterConfig + - NewSplitterConfig + - SplitNone + +# 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/prometheus-receiver-scope.yaml b/.chloggen/prometheus-receiver-scope.yaml new file mode 100644 index 000000000000..3bdb60395d7f --- /dev/null +++ b/.chloggen/prometheus-receiver-scope.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: The otel_scope_name and otel_scope_version labels are used to populate scope name and version. otel_scope_info is used to populate scope attributes. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25870] + +# (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/prometheus_translate_ucum.yaml b/.chloggen/prometheus_translate_ucum.yaml new file mode 100644 index 000000000000..f730be37c202 --- /dev/null +++ b/.chloggen/prometheus_translate_ucum.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: receiver/prometheus + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: translate units from prometheus to UCUM + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [23208] + +# (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, api] diff --git a/.chloggen/remove-gcp-retryonfailure.yaml b/.chloggen/remove-gcp-retryonfailure.yaml new file mode 100644 index 000000000000..11a90f4ad307 --- /dev/null +++ b/.chloggen/remove-gcp-retryonfailure.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: googlecloudexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: remove retry_on_failure from the googlecloud exporter. The exporter itself handles retries, and retrying can cause issues. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [57233] + +# (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, api] diff --git a/.chloggen/snmpreceiver-add-timeout.yaml b/.chloggen/snmpreceiver-add-timeout.yaml new file mode 100755 index 000000000000..c18256dc1f84 --- /dev/null +++ b/.chloggen/snmpreceiver-add-timeout.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: snmpreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Timeout for SNMP requests can now be configured. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25885] + +# (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/telemetrygen-set-log-body.yaml b/.chloggen/telemetrygen-set-log-body.yaml new file mode 100644 index 000000000000..556a3aa4a02c --- /dev/null +++ b/.chloggen/telemetrygen-set-log-body.yaml @@ -0,0 +1,20 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: telemetrygen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: The telemetrygen now supports setting the log's body + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26031] + +# 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/telemetrygen-status-code-default-value-bug.yaml b/.chloggen/telemetrygen-status-code-default-value-bug.yaml new file mode 100755 index 000000000000..2cf21e111448 --- /dev/null +++ b/.chloggen/telemetrygen-status-code-default-value-bug.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: cmd/telemetrygen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: fix the default value of the arg status-code + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25849] + +# (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/xray-exporter-allow-random-trace-id.yaml b/.chloggen/xray-exporter-allow-random-trace-id.yaml new file mode 100644 index 000000000000..3563a5d09a75 --- /dev/null +++ b/.chloggen/xray-exporter-allow-random-trace-id.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: awsxrayexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "add `exporter.awsxray.skiptimestampvalidation` Alpha feature gate to remove xray timestamp restriction on first 32 bits of trace id" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26041] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3390b5c8ca0a..78118671acb3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -42,7 +42,7 @@ examples/demo/ @open-telemetry/collect exporter/alibabacloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91 exporter/awscloudwatchlogsexporter/ @open-telemetry/collector-contrib-approvers @boostchicken -exporter/awsemfexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia +exporter/awsemfexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia @bryan-aguilar exporter/awskinesisexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy exporter/awss3exporter/ @open-telemetry/collector-contrib-approvers @atoulme @pdelewski exporter/awsxrayexporter/ @open-telemetry/collector-contrib-approvers @wangzlei @srprash @@ -139,7 +139,7 @@ pkg/translator/prometheus/ @open-telemetry/collect pkg/translator/prometheusremotewrite/ @open-telemetry/collector-contrib-approvers @Aneurysm9 pkg/translator/signalfx/ @open-telemetry/collector-contrib-approvers @dmitryax pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1 -pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @mrod1598 @binaryfissiongames +pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @BinaryFissionGames processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken processor/cumulativetodeltaprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @@ -148,7 +148,7 @@ processor/deltatorateprocessor/ @open-telemetry/collect processor/filterprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @boostchicken processor/groupbyattrsprocessor/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo processor/groupbytraceprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling -processor/k8sattributesprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick @fatsheep9146 +processor/k8sattributesprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick @fatsheep9146 @TylerHelmuth processor/logstransformprocessor/ @open-telemetry/collector-contrib-approvers @djaglowski @dehaansa processor/metricsgenerationprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9 processor/metricstransformprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @@ -168,7 +168,7 @@ processor/spanprocessor/ @open-telemetry/collect processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley -receiver/activedirectorydsreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @binaryfissiongames +receiver/activedirectorydsreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames receiver/aerospikereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @antonblock receiver/apachereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski receiver/apachesparkreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @Caleb-Hurshman @mrsillydog @@ -190,12 +190,12 @@ receiver/collectdreceiver/ @open-telemetry/collect receiver/couchdbreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski receiver/datadogreceiver/ @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @jpkrohling @MovieStoreGuy receiver/dockerstatsreceiver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis -receiver/elasticsearchreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @binaryfissiongames +receiver/elasticsearchreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames receiver/expvarreceiver/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy receiver/filelogreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski receiver/filereceiver/ @open-telemetry/collector-contrib-approvers @pmcollins @djaglowski receiver/filestatsreceiver/ @open-telemetry/collector-contrib-approvers @atoulme -receiver/flinkmetricsreceiver/ @open-telemetry/collector-contrib-approvers @jonathanwamsley @djaglowski +receiver/flinkmetricsreceiver/ @open-telemetry/collector-contrib-approvers @JonathanWamsley @djaglowski receiver/fluentforwardreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax receiver/gitproviderreceiver/ @open-telemetry/collector-contrib-approvers @adrielp @astencel-sumo receiver/googlecloudpubsubreceiver/ @open-telemetry/collector-contrib-approvers @alexvanboxel @@ -203,17 +203,17 @@ receiver/googlecloudspannerreceiver/ @open-telemetry/collect receiver/haproxyreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy receiver/hostmetricsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax receiver/httpcheckreceiver/ @open-telemetry/collector-contrib-approvers @codeboten -receiver/iisreceiver/ @open-telemetry/collector-contrib-approvers @mrod1598 @djaglowski +receiver/iisreceiver/ @open-telemetry/collector-contrib-approvers @Mrod1598 @djaglowski receiver/influxdbreceiver/ @open-telemetry/collector-contrib-approvers @jacobmarble receiver/jaegerreceiver/ @open-telemetry/collector-contrib-approvers @jpkrohling receiver/jmxreceiver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick receiver/journaldreceiver/ @open-telemetry/collector-contrib-approvers @sumo-drosiek @djaglowski -receiver/k8sclusterreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax -receiver/k8seventsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax -receiver/k8sobjectsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @hvaghani221 +receiver/k8sclusterreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth +receiver/k8seventsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth +receiver/k8sobjectsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @hvaghani221 @TylerHelmuth receiver/kafkametricsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax receiver/kafkareceiver/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy -receiver/kubeletstatsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax +receiver/kubeletstatsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth receiver/lokireceiver/ @open-telemetry/collector-contrib-approvers @mar4uk @jpkrohling receiver/memcachedreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski receiver/mongodbatlasreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @schmikei diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 482a2e357410..b9a1950fa4f2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,6 +12,11 @@ updates: schedule: interval: "weekly" day: "wednesday" + - package-ecosystem: "gomod" + directory: "/cmd/githubgen" + schedule: + interval: "weekly" + day: "wednesday" - package-ecosystem: "gomod" directory: "/cmd/mdatagen" schedule: @@ -1097,8 +1102,3 @@ updates: schedule: interval: "weekly" day: "wednesday" - - package-ecosystem: "gomod" - directory: "/receiver/splunkenterprisereceiver" - schedule: - interval: "weekly" - day: "wednesday" diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index b429419fa6eb..2669dae5c643 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -33,6 +33,7 @@ jobs: - extension - internal - pkg + - cmd - other runs-on: windows-latest if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }} diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f4e852345764..8749063621f4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -72,6 +72,7 @@ jobs: - connector - internal - pkg + - cmd - other runs-on: ubuntu-latest needs: [setup-environment] @@ -184,6 +185,8 @@ jobs: run: make checkdoc - name: CheckMetadata run: make checkmetadata + - name: CheckApi + run: make checkapi - name: Porto run: | make -j2 goporto @@ -208,10 +211,6 @@ jobs: run: | make -j2 generate git diff --exit-code ':!*go.sum' || (echo 'Generated code is out of date, please run "make generate" and commit the changes in this PR.' && exit 1) - - name: Gen codeowners - run: | - make gengithub - git diff -s --exit-code || (echo 'Generated code is out of date, please run "make gengithub" and commit the changes in this PR.' && exit 1) - name: Check gendependabot run: | make -j2 gendependabot @@ -235,6 +234,7 @@ jobs: - connector - internal - pkg + - cmd - other runs-on: ubuntu-latest needs: [setup-environment] diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index b5378ab2cf1e..255a0bbc5194 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,23 +35,15 @@ jobs: run: make -j2 gomoddownload - name: Build Docker Image run: | - make docker-otelcontribcol docker-telemetrygen - - name: export otelcontribcol image to tar + make docker-otelcontribcol + - name: export image to tar run: | docker save otelcontribcol:latest > /tmp/otelcontribcol.tar - - name: export telemetrygen image to tar - run: | - docker save telemetrygen:latest > /tmp/telemetrygen.tar - - name: Upload otelcontribcol artifact + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: otelcontribcol path: /tmp/otelcontribcol.tar - - name: Upload telemetrygen artifact - uses: actions/upload-artifact@v3 - with: - name: telemetrygen - path: /tmp/telemetrygen.tar kubernetes-test: env: KUBECONFIG: /tmp/kube-config-otelcol-e2e-testing @@ -89,23 +81,12 @@ jobs: with: name: otelcontribcol path: /tmp - - name: Load otelcontribcol Docker image + - name: Load Docker image run: | docker load --input /tmp/otelcontribcol.tar - name: Kind load image run: | kind load docker-image otelcontribcol:latest --name kind - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: telemetrygen - path: /tmp - - name: Load telemetrygen Docker image - run: | - docker load --input /tmp/telemetrygen.tar - - name: Kind load image - run: | - kind load docker-image telemetrygen:latest --name kind - name: run k8sclusterreceiver e2e tests run: | cd receiver/k8sclusterreceiver diff --git a/Makefile b/Makefile index a443dd0fd479..d09d98cb70cd 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,7 @@ OTEL_VERSION=main OTEL_RC_VERSION=main OTEL_STABLE_VERSION=main -BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelcontribcore/internal/version VERSION=$(shell git describe --always --match "v[0-9]*" HEAD) -BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)" COMP_REL_PATH=cmd/otelcontribcol/components.go MOD_NAME=github.com/open-telemetry/opentelemetry-collector-contrib @@ -21,6 +19,7 @@ TO_MOD_DIR=dirname {} \; | sort | grep -E '^./' EX_COMPONENTS=-not -path "./receiver/*" -not -path "./processor/*" -not -path "./exporter/*" -not -path "./extension/*" -not -path "./connector/*" EX_INTERNAL=-not -path "./internal/*" EX_PKG=-not -path "./pkg/*" +EX_CMD=-not -path "./cmd/*" # NONROOT_MODS includes ./* dirs (excludes . dir) NONROOT_MODS := $(shell find . $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) @@ -34,8 +33,9 @@ EXTENSION_MODS := $(shell find ./extension/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR CONNECTOR_MODS := $(shell find ./connector/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) INTERNAL_MODS := $(shell find ./internal/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) PKG_MODS := $(shell find ./pkg/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) -OTHER_MODS := $(shell find . $(EX_COMPONENTS) $(EX_INTERNAL) $(EX_PKG) $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) $(PWD) -ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(OTHER_MODS) +CMD_MODS := $(shell find ./cmd/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) +OTHER_MODS := $(shell find . $(EX_COMPONENTS) $(EX_INTERNAL) $(EX_PKG) $(EX_CMD) $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) $(PWD) +ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(CMD_MODS) $(OTHER_MODS) # find -exec dirname cannot be used to process multiple matching patterns FIND_INTEGRATION_TEST_MODS={ find . -type f -name "*integration_test.go" & find . -type f -name "*e2e_test.go" -not -path "./testbed/*"; } @@ -60,6 +60,7 @@ all-groups: @echo "\nconnector: $(CONNECTOR_MODS)" @echo "\ninternal: $(INTERNAL_MODS)" @echo "\npkg: $(PKG_MODS)" + @echo "\ncmd: $(CMD_MODS)" @echo "\nother: $(OTHER_MODS)" .PHONY: all @@ -206,6 +207,9 @@ for-internal-target: $(INTERNAL_MODS) .PHONY: for-pkg-target for-pkg-target: $(PKG_MODS) +.PHONY: for-cmd-target +for-cmd-target: $(CMD_MODS) + .PHONY: for-other-target for-other-target: $(OTHER_MODS) @@ -255,7 +259,8 @@ mdatagen-test: .PHONY: gengithub gengithub: - $(GOCMD) run cmd/githubgen/main.go . + cd cmd/githubgen && $(GOCMD) install . + githubgen .PHONY: update-codeowners update-codeowners: gengithub generate @@ -286,7 +291,7 @@ genotelcontribcol: $(BUILDER) .PHONY: otelcontribcol otelcontribcol: cd ./cmd/otelcontribcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/otelcontribcol_$(GOOS)_$(GOARCH)$(EXTENSION) \ - $(BUILD_INFO) -tags $(GO_BUILD_TAGS) . + -tags $(GO_BUILD_TAGS) . .PHONY: genoteltestbedcol genoteltestbedcol: $(BUILDER) @@ -297,13 +302,13 @@ genoteltestbedcol: $(BUILDER) .PHONY: oteltestbedcol oteltestbedcol: cd ./cmd/oteltestbedcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/oteltestbedcol_$(GOOS)_$(GOARCH)$(EXTENSION) \ - $(BUILD_INFO) -tags $(GO_BUILD_TAGS) . + -tags $(GO_BUILD_TAGS) . # Build the telemetrygen executable. .PHONY: telemetrygen telemetrygen: cd ./cmd/telemetrygen && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/telemetrygen_$(GOOS)_$(GOARCH)$(EXTENSION) \ - $(BUILD_INFO) -tags $(GO_BUILD_TAGS) . + -tags $(GO_BUILD_TAGS) . .PHONY: update-dep update-dep: @@ -353,6 +358,10 @@ checkdoc: $(CHECKFILE) checkmetadata: $(CHECKFILE) $(CHECKFILE) --project-path $(CURDIR) --component-rel-path $(COMP_REL_PATH) --module-name $(MOD_NAME) --file-name "metadata.yaml" +.PHONY: checkapi +checkapi: + $(GOCMD) run cmd/checkapi/main.go . + .PHONY: all-checklinks all-checklinks: $(MAKE) $(FOR_GROUP_TARGET) TARGET="checklinks" diff --git a/Makefile.Common b/Makefile.Common index 536043803a5e..8f76bf502522 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -165,7 +165,7 @@ fmt: $(GOIMPORTS) .PHONY: lint lint: $(LINT) checklicense misspell - $(LINT) run --allow-parallel-runners --verbose --build-tags integration --path-prefix $(shell basename "$(CURDIR)") + $(LINT) run --allow-parallel-runners --verbose --build-tags integration --timeout=30m --path-prefix $(shell basename "$(CURDIR)") .PHONY: govulncheck govulncheck: $(GOVULNCHECK) diff --git a/cmd/checkapi/allowlist.txt b/cmd/checkapi/allowlist.txt new file mode 100644 index 000000000000..53c927380f3e --- /dev/null +++ b/cmd/checkapi/allowlist.txt @@ -0,0 +1,44 @@ +connector/servicegraphconnector +exporter/alibabacloudlogserviceexporter +exporter/awscloudwatchlogsexporter +exporter/awskinesisexporter +exporter/awss3exporter +exporter/azuremonitorexporter +exporter/coralogixexporter +exporter/datasetexporter +exporter/dynatraceexporter +exporter/elasticsearchexporter +exporter/f5cloudexporter +exporter/jaegerexporter +exporter/kafkaexporter +exporter/loadbalancingexporter +exporter/logzioexporter +exporter/lokiexporter +exporter/pulsarexporter +exporter/sentryexporter +exporter/sumologicexporter +extension/observer/ecsobserver +extension/observer +extension/observer/k8sobserver +processor/groupbyattrsprocessor +processor/groupbytraceprocessor +processor/probabilisticsamplerprocessor +processor/servicegraphprocessor +processor/tailsamplingprocessor +receiver/carbonreceiver +receiver/collectdreceiver +receiver/dockerstatsreceiver +receiver/fluentforwardreceiver +receiver/jaegerreceiver +receiver/journaldreceiver +receiver/k8sobjectsreceiver +receiver/kafkareceiver +receiver/mongodbatlasreceiver +receiver/mongodbreceiver +receiver/mysqlreceiver +receiver/nsxtreceiver +receiver/otlpjsonfilereceiver +receiver/podmanreceiver +receiver/pulsarreceiver +receiver/statsdreceiver +receiver/windowseventlogreceiver \ No newline at end of file diff --git a/cmd/checkapi/main.go b/cmd/checkapi/main.go new file mode 100644 index 000000000000..609d1fd55991 --- /dev/null +++ b/cmd/checkapi/main.go @@ -0,0 +1,246 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package main + +import ( + "errors" + "flag" + "fmt" + "go/ast" + "go/parser" + "go/token" + "io/fs" + "log" + "os" + "path/filepath" + "sort" + "strings" +) + +func main() { + folder := flag.String("folder", ".", "folder investigated for modules") + allowlistFilePath := flag.String("allowlist", "cmd/checkapi/allowlist.txt", "path to a file containing an allowlist of paths to ignore") + flag.Parse() + if err := run(*folder, *allowlistFilePath); err != nil { + log.Fatal(err) + } +} + +type function struct { + Name string `json:"name"` + Receiver string `json:"receiver"` + ReturnTypes []string `json:"return_types,omitempty"` + ParamTypes []string `json:"param_types,omitempty"` +} + +type api struct { + Values []string `json:"values,omitempty"` + Structs []string `json:"structs,omitempty"` + Functions []*function `json:"functions,omitempty"` +} + +func run(folder string, allowlistFilePath string) error { + allowlistData, err := os.ReadFile(allowlistFilePath) + if err != nil { + return err + } + allowlist := strings.Split(string(allowlistData), "\n") + var errs []error + err = filepath.Walk(folder, func(path string, info fs.FileInfo, err error) error { + if info.Name() == "go.mod" { + base := filepath.Dir(path) + relativeBase, err := filepath.Rel(folder, base) + if err != nil { + return err + } + componentType := strings.Split(relativeBase, string(os.PathSeparator))[0] + switch componentType { + case "receiver", "processor", "exporter", "connector", "extension": + default: + return nil + } + + for _, a := range allowlist { + if a == relativeBase { + fmt.Printf("Ignoring %s per allowlist\n", base) + return nil + } + } + if err := walkFolder(base, componentType); err != nil { + errs = append(errs, err) + } + } + return nil + }) + if err != nil { + return err + } + if len(errs) > 0 { + return errors.Join(errs...) + } + return nil +} + +func handleFile(f *ast.File, result *api) { + for _, d := range f.Decls { + if str, isStr := d.(*ast.GenDecl); isStr { + for _, s := range str.Specs { + if values, ok := s.(*ast.ValueSpec); ok { + for _, v := range values.Names { + if v.IsExported() { + result.Values = append(result.Values, v.Name) + } + } + } + if t, ok := s.(*ast.TypeSpec); ok { + if t.Name.IsExported() { + result.Structs = append(result.Structs, t.Name.String()) + } + } + + } + } + if fn, isFn := d.(*ast.FuncDecl); isFn { + if !fn.Name.IsExported() { + continue + } + exported := false + receiver := "" + if fn.Recv.NumFields() == 0 && !strings.HasPrefix(fn.Name.String(), "Test") && !strings.HasPrefix(fn.Name.String(), "Benchmark") { + exported = true + } + if fn.Recv.NumFields() > 0 { + + for _, t := range fn.Recv.List { + for _, n := range t.Names { + exported = exported || n.IsExported() + if n.IsExported() { + receiver = n.Name + } + } + } + } + if exported { + var returnTypes []string + if fn.Type.Results.NumFields() > 0 { + for _, r := range fn.Type.Results.List { + returnTypes = append(returnTypes, exprToString(r.Type)) + } + } + var params []string + if fn.Type.Params.NumFields() > 0 { + for _, r := range fn.Type.Params.List { + params = append(params, exprToString(r.Type)) + } + } + f := &function{ + Name: fn.Name.Name, + Receiver: receiver, + ParamTypes: params, + ReturnTypes: returnTypes, + } + result.Functions = append(result.Functions, f) + } + } + } +} + +func walkFolder(folder string, componentType string) error { + result := &api{} + set := token.NewFileSet() + packs, err := parser.ParseDir(set, folder, nil, 0) + if err != nil { + return err + } + + for _, pack := range packs { + for _, f := range pack.Files { + handleFile(f, result) + } + } + sort.Strings(result.Structs) + sort.Strings(result.Values) + sort.Slice(result.Functions, func(i int, j int) bool { + return strings.Compare(result.Functions[i].Name, result.Functions[j].Name) < 0 + }) + fnNames := make([]string, len(result.Functions)) + for i, fn := range result.Functions { + fnNames[i] = fn.Name + } + if len(result.Structs) == 0 && len(result.Values) == 0 && len(result.Functions) == 0 { + return nil + } + + if len(result.Functions) > 1 { + return fmt.Errorf("%s has more than one function: %q", folder, strings.Join(fnNames, ",")) + } + if len(result.Functions) == 0 { + return fmt.Errorf("%s has no functions defined", folder) + } + newFactoryFn := result.Functions[0] + if newFactoryFn.Name != "NewFactory" { + return fmt.Errorf("%s does not define a NewFactory function", folder) + } + if newFactoryFn.Receiver != "" { + return fmt.Errorf("%s associated NewFactory with a receiver type", folder) + } + if len(newFactoryFn.ReturnTypes) != 1 { + return fmt.Errorf("%s NewFactory function returns more than one result", folder) + } + returnType := newFactoryFn.ReturnTypes[0] + + if returnType != fmt.Sprintf("%s.Factory", componentType) { + return fmt.Errorf("%s NewFactory function does not return a valid type: %s, expected %s.Factory", folder, returnType, componentType) + } + return nil +} + +func exprToString(expr ast.Expr) string { + switch e := expr.(type) { + case *ast.MapType: + return fmt.Sprintf("map[%s]%s", exprToString(e.Key), exprToString(e.Value)) + case *ast.ArrayType: + return fmt.Sprintf("[%s]%s", exprToString(e.Len), exprToString(e.Elt)) + case *ast.StructType: + var fields []string + for _, f := range e.Fields.List { + fields = append(fields, exprToString(f.Type)) + } + return fmt.Sprintf("{%s}", strings.Join(fields, ",")) + case *ast.InterfaceType: + var methods []string + for _, f := range e.Methods.List { + methods = append(methods, "func "+exprToString(f.Type)) + } + return fmt.Sprintf("{%s}", strings.Join(methods, ",")) + case *ast.ChanType: + return fmt.Sprintf("chan(%s)", exprToString(e.Value)) + case *ast.FuncType: + var results []string + for _, r := range e.Results.List { + results = append(results, exprToString(r.Type)) + } + var params []string + for _, r := range e.Params.List { + params = append(params, exprToString(r.Type)) + } + return fmt.Sprintf("func(%s) %s", strings.Join(params, ","), strings.Join(results, ",")) + case *ast.SelectorExpr: + return fmt.Sprintf("%s.%s", exprToString(e.X), e.Sel.Name) + case *ast.Ident: + return e.Name + case nil: + return "" + case *ast.StarExpr: + return fmt.Sprintf("*%s", exprToString(e.X)) + case *ast.Ellipsis: + return fmt.Sprintf("%s...", exprToString(e.Elt)) + case *ast.IndexExpr: + return fmt.Sprintf("%s[%s]", exprToString(e.X), exprToString(e.Index)) + case *ast.BasicLit: + return e.Value + default: + panic(fmt.Sprintf("Unsupported expr type: %#v", expr)) + } +} diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 7791fa0d5dda..a4908615be08 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/fatih/structtag v1.2.0 - github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib v0.83.0 + github.com/google/uuid v1.3.1 + github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.83.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.83.0 @@ -203,7 +203,7 @@ require ( cloud.google.com/go/longrunning v0.5.1 // indirect cloud.google.com/go/monitoring v1.15.1 // indirect cloud.google.com/go/pubsub v1.33.0 // indirect - cloud.google.com/go/spanner v1.47.0 // indirect + cloud.google.com/go/spanner v1.48.0 // indirect cloud.google.com/go/trace v1.10.1 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -231,8 +231,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.52.1 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.13.0 // indirect + github.com/ClickHouse/ch-go v0.58.2 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.13.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect @@ -253,10 +253,10 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 // indirect github.com/IBM/sarama v1.40.1 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -267,36 +267,36 @@ require ( github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.0.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.51 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.53 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/antonmedv/expr v1.13.0 // indirect + github.com/antonmedv/expr v1.14.3 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect github.com/apache/thrift v0.18.1 // indirect 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.44.323 // indirect - github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.33 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.36 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // 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.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // 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.9.11 // 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.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // 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.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect @@ -381,11 +381,11 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/cadvisor v0.47.3 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect - github.com/google/gnostic v0.6.9 // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // 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.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -479,7 +479,7 @@ require ( github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mongodb-forks/digest v1.0.4 // indirect + github.com/mongodb-forks/digest v1.0.5 // indirect github.com/montanaflynn/stats v0.7.0 // indirect github.com/mostynb/go-grpc-compression v1.2.0 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect @@ -541,7 +541,7 @@ require ( github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/sftp v1.13.5 // indirect @@ -559,7 +559,7 @@ require ( github.com/relvacode/iso8601 v1.3.0 // indirect github.com/rs/cors v1.9.0 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect - github.com/scalyr/dataset-go v0.12.1 // indirect + github.com/scalyr/dataset-go v0.14.0 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -569,7 +569,7 @@ require ( github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect github.com/signalfx/golib/v3 v3.3.47 // indirect github.com/signalfx/sapm-proto v0.13.0 // indirect - github.com/sijms/go-ora/v2 v2.7.11 // indirect + github.com/sijms/go-ora/v2 v2.7.15 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.23 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -583,7 +583,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect github.com/tidwall/gjson v1.14.3 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -638,11 +638,11 @@ require ( go.opentelemetry.io/collector/processor/batchprocessor v0.83.0 // indirect go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect @@ -651,10 +651,10 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.2.1 // indirect @@ -670,8 +670,8 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect @@ -684,14 +684,14 @@ require ( 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.27.4 // indirect - k8s.io/apimachinery v0.27.4 // indirect - k8s.io/client-go v0.27.4 // indirect + k8s.io/api v0.28.1 // indirect + k8s.io/apimachinery v0.28.1 // indirect + k8s.io/client-go v0.28.1 // indirect k8s.io/klog v1.0.0 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/kubelet v0.27.4 // indirect - k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/controller-runtime v0.15.1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 05e013875502..aed907affe66 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -533,8 +533,8 @@ cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+ cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= -cloud.google.com/go/spanner v1.47.0 h1:aqiMP8dhsEXgn9K5EZBWxPG7dxIiyM2VaikqeU4iteg= -cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= +cloud.google.com/go/spanner v1.48.0 h1:lh3Xqe2G+/bhJ1O3JxYt4ahYXOz/wPH4D2Wrx2vFoNI= +cloud.google.com/go/spanner v1.48.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= @@ -722,10 +722,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDm github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.52.1 h1:nucdgfD1BDSHjbNaG3VNebonxJzD8fX8jbuBpfo5VY0= -github.com/ClickHouse/ch-go v0.52.1/go.mod h1:B9htMJ0hii/zrC2hljUKdnagRBuLqtRG/GrU3jqCwRk= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbOtM+e/3qdexG9k= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0= +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.13.2 h1:LSg6670+xbd5VczO5Ei3DHZBIeGulfwhNuHCUth/qOA= +github.com/ClickHouse/clickhouse-go/v2 v2.13.2/go.mod h1:4QITCrdY/ugPYA+QGnJ92h+v7TGaZQ7l0393Q/wlM3Q= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= @@ -777,15 +777,15 @@ github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaa github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 h1:ugYJK/neZQtQeh2jc5xNoDFiMQojlAkoqJMRb7vTu1U= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 h1:1iUFJlwEsO3jbEitj0i9+XIjaY1QsjnUy7J3J81HuH4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0/go.mod h1:otJdxGjog6MfV/93oprfeXgyFrGrqsVvDhdM6P779Rk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 h1:Fa7XySHYw2HdumRuo2TYiYK5LkGJuwzTiqAPFoZ7t1s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0/go.mod h1:7BFtqicd8QzUKtbxBHq8/by6aMYL3mmnEEK0vLtVins= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 h1:82lUmcpHzBEpGP4qURZvMSU1rJV0AAfXtOCh7Qz6oDw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0/go.mod h1:6abS6wU43wU97qP+JseSJq2+C8/XL50co74AhoMJwwU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.42.0 h1:thAXdOpdEJPWW7kZmD8wU/yhQjd7PA6L01TxFcR5OOY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 h1:4gL61NwEDGAFvLJeEMjTYJm6r1T26k3QYuDZK9YEaAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 h1:2oH2ROo0TCtGYIga4Mp78lQsERv6Ki9nmIkqiy5tQgM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1/go.mod h1:mp8K83k9NeKyqV3LZPOqTi2aaH+gx1zALp0mlYYkjB4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 h1:RZIhpzvjXPF4o7RPBXuyPMhHF0mhCRwtN3h1hPT8DBE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1/go.mod h1:wNaetbDWzGD7k9d1/e0FQSy8qoF3vG2c4PkHgIWnmns= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 h1:lP8YpTi26Bei2OrXpQEUnNFPqKT6bTn3P8DvJC4i8WQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1/go.mod h1:g9zEQ45EhrGGA6HyCtxi8yL0BZ0vD+pVaqSkiLjVIzY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.43.1 h1:EA/FmSYRyeL2ZogHD8ZCPAt96UZh/U76wQjGhzRFEHE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 h1:ti4stlXHjDhGl+1h+EpqXv9+Wxv0XqCB3XTT4W6ZoQU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1/go.mod h1:lv7cjEH/BKG+7xh3vR4T8//UkWZ9eIkgAk6HpN/T6rk= github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= @@ -833,6 +833,8 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d h1:wvStE9wLpws31NiWUx+38wny1msZ/tm+eL5xmm4Y7So= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d/go.mod h1:9XMFaCeRyW7fC9XJOWQ+NdAv8VLG7ys7l3x4ozEGLUQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= @@ -886,8 +888,8 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/alexflint/go-filemutex v1.2.0/go.mod h1:mYyQSWvw9Tx2/H2n9qXPb52tTYfE0pZAWcBq5mK025c= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/aliyun/aliyun-log-go-sdk v0.1.51 h1:XEtzCGEUY2QAkMVy/5YoP/vlb9tDZdaaBnbAKlvaLVU= -github.com/aliyun/aliyun-log-go-sdk v0.1.51/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= +github.com/aliyun/aliyun-log-go-sdk v0.1.53 h1:3kI+QASsOzxLI4Ij8LBOmRR+6zFIp1mlAdfOAdkiI8k= +github.com/aliyun/aliyun-log-go-sdk v0.1.53/go.mod h1:/U0mxwX7uG2K2fbfsF92BR64zmbmJyx7WQtyKaCdRL8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -897,8 +899,8 @@ github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQY github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antonmedv/expr v1.13.0 h1:8YrTtlCzlOtXw+hpeCLDLL2uo0C0k6jmYpYTGws5c5w= -github.com/antonmedv/expr v1.13.0/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= +github.com/antonmedv/expr v1.14.3 h1:GPrP7xKPWkFaLANPS7tPrgkNs7FMHpZdL72Dc5kFykg= +github.com/antonmedv/expr v1.14.3/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= @@ -943,41 +945,41 @@ github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= 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.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= 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.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= 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.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= 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.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= 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.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= 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.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= 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.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= @@ -988,29 +990,29 @@ 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.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= 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.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= 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.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2/go.mod h1:7YAKee7SYksF6IAwXXuZ7bp4EIUBRJDysKZneqtspPM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA= 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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= 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.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= 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.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= 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.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw= github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -1456,7 +1458,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1816,8 +1817,8 @@ github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6 github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA= github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= +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= 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= @@ -1865,14 +1866,15 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2481,8 +2483,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb 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/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxnsSvZ64= -github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA= +github.com/mongodb-forks/digest v1.0.5 h1:EJu3wtLZcA0HCvsZpX5yuD193/sW9tHiNvrEM5apXMk= +github.com/mongodb-forks/digest v1.0.5/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= @@ -2711,8 +2713,8 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -2844,8 +2846,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2877,8 +2879,8 @@ github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9k github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 h1:Y7xOFbD+3jaPw+VN7lkakNJ/pa+ZSQVFp1ONtJaBxns= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/scalyr/dataset-go v0.12.1 h1:B8xw2+HOW4B2i4BMEJyLhMcSEc35snjdyVIgOr8+dwI= -github.com/scalyr/dataset-go v0.12.1/go.mod h1:6Go51mPPv3TminPxEcbpmVki/UzXaMcrL4bseyziilQ= +github.com/scalyr/dataset-go v0.14.0 h1:uRkoUt6LcMcH3VUTjOakQ4aq+1ooJB2t47oqYRUkV/k= +github.com/scalyr/dataset-go v0.14.0/go.mod h1:+a4BvVyS7mKquK7ySuWh4vygyDBREQrdikdcnABYKFw= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2925,8 +2927,8 @@ github.com/signalfx/sapm-proto v0.13.0 h1:yEkp1+MAU4vZvnJMp56uhVlRjlvCK7KQjBg0g2 github.com/signalfx/sapm-proto v0.13.0/go.mod h1:C72HjeCW5v0Llk6pIVJ/ZH8A5GbiZpCCSkE1dSlpWxY= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 h1:FCyZbLP9tqrwca1CLRxosGCbBXzaL7oFXmEbrUbiwSM= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1/go.mod h1:92AQ/lCA08Aw2Eg8mgdIAak7IWyTbV5PZHocEO7vH0g= -github.com/sijms/go-ora/v2 v2.7.11 h1:RqyIXtTyIavMfQWAB/pRPbCo3m9daS4ks7sHzWSweaA= -github.com/sijms/go-ora/v2 v2.7.11/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.7.15 h1:39rGXS0lC3RzxcrlmfkrBAHzD6OKF+m3RI7VIyht6Ds= +github.com/sijms/go-ora/v2 v2.7.15/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -3044,8 +3046,8 @@ github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 h1:Owbauh0pI5HNddLgoozHEgwZMMXh1WL2fDhRZTMHcmg= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 h1:2e3mYN464zl3jaCIDb/CcKEYi7hW22MsdJqBGknjq0U= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs= github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= @@ -3322,8 +3324,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.3 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0/go.mod h1:HSmzQvagH8pS2/xrK7ScWsk0vAMtRTGbMFgInXCi8Tc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0/go.mod h1:U5rUt7Rw6zuORsWNfpMRy8XMNKLrmIlv/4HgLVW/d5M= @@ -3348,8 +3350,9 @@ go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -3390,8 +3393,9 @@ go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= @@ -3402,8 +3406,9 @@ go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= @@ -3420,8 +3425,9 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= @@ -3663,7 +3669,6 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -4126,8 +4131,9 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= @@ -4194,8 +4200,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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= @@ -4532,8 +4538,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= @@ -4542,8 +4548,8 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -4555,8 +4561,8 @@ k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= @@ -4587,8 +4593,9 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kms v0.26.2/go.mod h1:69qGnf1NsFOQP07fBYqNLZklqEHSJF024JqYCaeVxHg= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= @@ -4597,8 +4604,8 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/kubelet v0.27.4 h1:P8+MoRx4ikcAc5eEa3k2A6kd8AXtoDRaoC8KX2HFZe4= k8s.io/kubelet v0.27.4/go.mod h1:2y4peCA57vKEhBcDL6Q5EkPuGP7FFxj9U41NV9hk1ac= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= @@ -4610,8 +4617,8 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= diff --git a/cmd/githubgen/Makefile b/cmd/githubgen/Makefile new file mode 100644 index 000000000000..ded7a36092dc --- /dev/null +++ b/cmd/githubgen/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/cmd/githubgen/README.md b/cmd/githubgen/README.md new file mode 100644 index 000000000000..2703499eba8d --- /dev/null +++ b/cmd/githubgen/README.md @@ -0,0 +1,31 @@ +# githubgen + +This executable is used to generate the `.github/CODEOWNERS` and `.github/ALLOWLIST` files. + +It reads status metadata from `metadata.yaml` files located throughout the repository. + +It checks that codeowners are known members of the OpenTelemetry organization. + +## Usage + +``` +$> make gengithub +``` +The equivalent of: +``` +$> cd cmd/githubgen && $(GOCMD) install . +$> GITHUB_TOKEN= githubgen --folder . [--allowlist cmd/githubgen/allowlist.txt] +``` + +## Checking codeowners against OpenTelemetry membership via Github API + +To authenticate, set the environment variable `GITHUB_TOKEN` to a PAT token. + +For each codeowner, the script will check if the user is registered as a member of the OpenTelemetry organization. + +If any codeowner is missing, it will stop and print names of missing codeowners. + +These can be added to allowlist.txt as a workaround. + +If a codeowner is present in allowlist.txt and also a member of the OpenTelemetry organization, the script will error out. + diff --git a/cmd/githubgen/allowlist.txt b/cmd/githubgen/allowlist.txt new file mode 100644 index 000000000000..e46daa181df1 --- /dev/null +++ b/cmd/githubgen/allowlist.txt @@ -0,0 +1,23 @@ +Caleb-Hurshman +Doron-Bargo +MaxKsyunz +MitchellGale +YANG-DB +agoallikmaa +alexvanboxel +architjugran +asaharn +avadhut123pisal +billmeyer +eedorenko +emreyalvac +keep94 +kiranmayib +kkujawa-sumo +leonsp-ai +liqiangz +oded-dd +shaochengwang +svrakitin +thepeterstone +yiyang5055 \ No newline at end of file diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod new file mode 100644 index 000000000000..658c59193674 --- /dev/null +++ b/cmd/githubgen/go.mod @@ -0,0 +1,30 @@ +module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen + +go 1.20 + +require ( + github.com/google/go-github/v53 v53.2.0 + go.opentelemetry.io/collector/confmap v0.83.0 +) + +require ( + github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect + github.com/cloudflare/circl v1.3.3 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-querystring v1.1.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.0.1 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sys v0.8.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum new file mode 100644 index 000000000000..0b22a3d3c488 --- /dev/null +++ b/cmd/githubgen/go.sum @@ -0,0 +1,73 @@ +github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA= +github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= +github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +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.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +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 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI= +github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao= +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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= +github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +go.opentelemetry.io/collector/confmap v0.83.0 h1:eUaiFdhTLkFdNpMi5FLSHSQ6X2FcEHe0KfEUt9ZtVlI= +go.opentelemetry.io/collector/confmap v0.83.0/go.mod h1:ZsmLyJ+4VeO+qz5o1RKadRoY4Db+d8PYwiLCJ3Z5Et8= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +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-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/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.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/cmd/githubgen/main.go b/cmd/githubgen/main.go index d5fab2a24520..7d7bb41beef8 100644 --- a/cmd/githubgen/main.go +++ b/cmd/githubgen/main.go @@ -14,6 +14,7 @@ import ( "sort" "strings" + "github.com/google/go-github/v53/github" "go.opentelemetry.io/collector/confmap/provider/fileprovider" ) @@ -79,9 +80,10 @@ const unmaintainedStatus = "unmaintained" // .github/CODEOWNERS // .github/ALLOWLIST func main() { + folder := flag.String("folder", ".", "folder investigated for codeowners") + allowlistFilePath := flag.String("allowlist", "cmd/githubgen/allowlist.txt", "path to a file containing an allowlist of members outside the OpenTelemetry organization") flag.Parse() - folder := flag.Arg(0) - if err := run(folder); err != nil { + if err := run(*folder, *allowlistFilePath); err != nil { log.Fatal(err) } } @@ -127,11 +129,27 @@ func loadMetadata(filePath string) (metadata, error) { return md, nil } -func run(folder string) error { +func run(folder string, allowlistFilePath string) error { + members, err := getGithubMembers() + if err != nil { + return err + } + allowlistData, err := os.ReadFile(allowlistFilePath) + if err != nil { + return err + } + allowlistLines := strings.Split(string(allowlistData), "\n") + + allowlist := make(map[string]struct{}, len(allowlistLines)) + for _, line := range allowlistLines { + allowlist[line] = struct{}{} + } + components := map[string]metadata{} - foldersList := []string{} + var foldersList []string maxLength := 0 - err := filepath.Walk(folder, func(path string, info fs.FileInfo, err error) error { + allCodeowners := map[string]struct{}{} + err = filepath.Walk(folder, func(path string, info fs.FileInfo, err error) error { if info.Name() == "metadata.yaml" { m, err := loadMetadata(path) if err != nil { @@ -149,16 +167,43 @@ func run(folder string) error { return nil } } + for _, id := range m.Status.Codeowners.Active { + allCodeowners[id] = struct{}{} + } if len(key) > maxLength { maxLength = len(key) } } return nil }) - sort.Strings(foldersList) if err != nil { return err } + sort.Strings(foldersList) + var missingCodeowners []string + var duplicateCodeowners []string + for codeowner := range allCodeowners { + _, present := members[codeowner] + + if !present { + _, allowed := allowlist[codeowner] + allowed = allowed || strings.HasPrefix(codeowner, "open-telemetry/") + if !allowed { + missingCodeowners = append(missingCodeowners, codeowner) + } + } else if _, ok := allowlist[codeowner]; ok { + duplicateCodeowners = append(duplicateCodeowners, codeowner) + } + } + if len(missingCodeowners) > 0 { + sort.Strings(missingCodeowners) + return fmt.Errorf("codeowners are not members: %s", strings.Join(missingCodeowners, ", ")) + } + if len(duplicateCodeowners) > 0 { + sort.Strings(duplicateCodeowners) + return fmt.Errorf("codeowners members duplicate in allowlist: %s", strings.Join(duplicateCodeowners, ", ")) + } + codeowners := codeownersHeader deprecatedList := "## DEPRECATED components\n" unmaintainedList := "\n## UNMAINTAINED components\n" @@ -206,3 +251,35 @@ LOOP: return nil } + +func getGithubMembers() (map[string]struct{}, error) { + client := github.NewTokenClient(context.Background(), os.Getenv("GITHUB_TOKEN")) + var allUsers []*github.User + pageIndex := 0 + for { + users, resp, err := client.Organizations.ListMembers(context.Background(), "open-telemetry", + &github.ListMembersOptions{ + PublicOnly: false, + ListOptions: github.ListOptions{ + PerPage: 50, + Page: pageIndex, + }, + }, + ) + if err != nil { + return nil, err + } + defer resp.Body.Close() + if len(users) == 0 { + break + } + allUsers = append(allUsers, users...) + pageIndex++ + } + + usernames := make(map[string]struct{}, len(allUsers)) + for _, u := range allUsers { + usernames[*u.Login] = struct{}{} + } + return usernames, nil +} diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index c447c666364d..e0106aad6d9b 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -218,7 +218,7 @@ require ( cloud.google.com/go/longrunning v0.5.1 // indirect cloud.google.com/go/monitoring v1.15.1 // indirect cloud.google.com/go/pubsub v1.33.0 // indirect - cloud.google.com/go/spanner v1.47.0 // indirect + cloud.google.com/go/spanner v1.48.0 // indirect cloud.google.com/go/trace v1.10.1 // indirect code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -250,8 +250,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.0.0 // indirect - github.com/ClickHouse/ch-go v0.52.1 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.13.0 // indirect + github.com/ClickHouse/ch-go v0.58.2 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.13.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect @@ -274,10 +274,10 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 // indirect github.com/IBM/sarama v1.40.1 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -288,36 +288,36 @@ require ( github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.0.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.51 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.53 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/antonmedv/expr v1.13.0 // indirect + github.com/antonmedv/expr v1.14.3 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect github.com/apache/thrift v0.18.1 // indirect 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.44.323 // indirect - github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.33 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.36 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // 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.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // 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.9.11 // 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.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // 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.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect @@ -403,12 +403,12 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/cadvisor v0.47.3 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect - github.com/google/gnostic v0.6.9 // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -503,7 +503,7 @@ require ( github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mongodb-forks/digest v1.0.4 // indirect + github.com/mongodb-forks/digest v1.0.5 // indirect github.com/montanaflynn/stats v0.7.0 // indirect github.com/mostynb/go-grpc-compression v1.2.0 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect @@ -559,7 +559,7 @@ require ( github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/sftp v1.13.5 // indirect @@ -577,7 +577,7 @@ require ( github.com/rs/cors v1.9.0 // indirect github.com/samber/lo v1.37.0 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect - github.com/scalyr/dataset-go v0.12.1 // indirect + github.com/scalyr/dataset-go v0.14.0 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -589,7 +589,7 @@ require ( github.com/signalfx/golib/v3 v3.3.47 // indirect github.com/signalfx/sapm-proto v0.13.0 // indirect github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect - github.com/sijms/go-ora/v2 v2.7.11 // indirect + github.com/sijms/go-ora/v2 v2.7.15 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.23 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -603,7 +603,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect github.com/tidwall/gjson v1.10.2 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -646,11 +646,11 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect @@ -659,10 +659,10 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.2.1 // indirect @@ -679,8 +679,8 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect @@ -694,14 +694,14 @@ require ( 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.27.4 // indirect - k8s.io/apimachinery v0.27.4 // indirect - k8s.io/client-go v0.27.4 // indirect + k8s.io/api v0.28.1 // indirect + k8s.io/apimachinery v0.28.1 // indirect + k8s.io/client-go v0.28.1 // indirect k8s.io/klog v1.0.0 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/kubelet v0.27.4 // indirect - k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/controller-runtime v0.15.1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 4dd79e12bc39..29a142b65d32 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -485,8 +485,8 @@ cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+ cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= -cloud.google.com/go/spanner v1.47.0 h1:aqiMP8dhsEXgn9K5EZBWxPG7dxIiyM2VaikqeU4iteg= -cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= +cloud.google.com/go/spanner v1.48.0 h1:lh3Xqe2G+/bhJ1O3JxYt4ahYXOz/wPH4D2Wrx2vFoNI= +cloud.google.com/go/spanner v1.48.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= @@ -668,10 +668,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDm github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.52.1 h1:nucdgfD1BDSHjbNaG3VNebonxJzD8fX8jbuBpfo5VY0= -github.com/ClickHouse/ch-go v0.52.1/go.mod h1:B9htMJ0hii/zrC2hljUKdnagRBuLqtRG/GrU3jqCwRk= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbOtM+e/3qdexG9k= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0= +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.13.2 h1:LSg6670+xbd5VczO5Ei3DHZBIeGulfwhNuHCUth/qOA= +github.com/ClickHouse/clickhouse-go/v2 v2.13.2/go.mod h1:4QITCrdY/ugPYA+QGnJ92h+v7TGaZQ7l0393Q/wlM3Q= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= @@ -723,15 +723,15 @@ github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaa github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 h1:ugYJK/neZQtQeh2jc5xNoDFiMQojlAkoqJMRb7vTu1U= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 h1:1iUFJlwEsO3jbEitj0i9+XIjaY1QsjnUy7J3J81HuH4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0/go.mod h1:otJdxGjog6MfV/93oprfeXgyFrGrqsVvDhdM6P779Rk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 h1:Fa7XySHYw2HdumRuo2TYiYK5LkGJuwzTiqAPFoZ7t1s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0/go.mod h1:7BFtqicd8QzUKtbxBHq8/by6aMYL3mmnEEK0vLtVins= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 h1:82lUmcpHzBEpGP4qURZvMSU1rJV0AAfXtOCh7Qz6oDw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0/go.mod h1:6abS6wU43wU97qP+JseSJq2+C8/XL50co74AhoMJwwU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.42.0 h1:thAXdOpdEJPWW7kZmD8wU/yhQjd7PA6L01TxFcR5OOY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 h1:4gL61NwEDGAFvLJeEMjTYJm6r1T26k3QYuDZK9YEaAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 h1:2oH2ROo0TCtGYIga4Mp78lQsERv6Ki9nmIkqiy5tQgM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1/go.mod h1:mp8K83k9NeKyqV3LZPOqTi2aaH+gx1zALp0mlYYkjB4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 h1:RZIhpzvjXPF4o7RPBXuyPMhHF0mhCRwtN3h1hPT8DBE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1/go.mod h1:wNaetbDWzGD7k9d1/e0FQSy8qoF3vG2c4PkHgIWnmns= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 h1:lP8YpTi26Bei2OrXpQEUnNFPqKT6bTn3P8DvJC4i8WQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1/go.mod h1:g9zEQ45EhrGGA6HyCtxi8yL0BZ0vD+pVaqSkiLjVIzY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.43.1 h1:EA/FmSYRyeL2ZogHD8ZCPAt96UZh/U76wQjGhzRFEHE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 h1:ti4stlXHjDhGl+1h+EpqXv9+Wxv0XqCB3XTT4W6ZoQU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1/go.mod h1:lv7cjEH/BKG+7xh3vR4T8//UkWZ9eIkgAk6HpN/T6rk= github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= @@ -779,6 +779,8 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d h1:wvStE9wLpws31NiWUx+38wny1msZ/tm+eL5xmm4Y7So= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d/go.mod h1:9XMFaCeRyW7fC9XJOWQ+NdAv8VLG7ys7l3x4ozEGLUQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= @@ -832,8 +834,8 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/alexflint/go-filemutex v1.2.0/go.mod h1:mYyQSWvw9Tx2/H2n9qXPb52tTYfE0pZAWcBq5mK025c= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/aliyun/aliyun-log-go-sdk v0.1.51 h1:XEtzCGEUY2QAkMVy/5YoP/vlb9tDZdaaBnbAKlvaLVU= -github.com/aliyun/aliyun-log-go-sdk v0.1.51/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= +github.com/aliyun/aliyun-log-go-sdk v0.1.53 h1:3kI+QASsOzxLI4Ij8LBOmRR+6zFIp1mlAdfOAdkiI8k= +github.com/aliyun/aliyun-log-go-sdk v0.1.53/go.mod h1:/U0mxwX7uG2K2fbfsF92BR64zmbmJyx7WQtyKaCdRL8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -843,8 +845,8 @@ github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQY github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antonmedv/expr v1.13.0 h1:8YrTtlCzlOtXw+hpeCLDLL2uo0C0k6jmYpYTGws5c5w= -github.com/antonmedv/expr v1.13.0/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= +github.com/antonmedv/expr v1.14.3 h1:GPrP7xKPWkFaLANPS7tPrgkNs7FMHpZdL72Dc5kFykg= +github.com/antonmedv/expr v1.14.3/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= @@ -889,41 +891,41 @@ github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= 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.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= 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.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= 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.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= 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.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= 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.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= 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.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= 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.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= @@ -934,29 +936,29 @@ 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.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= 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.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= 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.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2/go.mod h1:7YAKee7SYksF6IAwXXuZ7bp4EIUBRJDysKZneqtspPM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA= 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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= 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.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= 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.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= 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.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw= github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -1401,7 +1403,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1755,8 +1756,8 @@ github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6 github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA= github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= +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= 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= @@ -1786,14 +1787,15 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2399,8 +2401,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb 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/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxnsSvZ64= -github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA= +github.com/mongodb-forks/digest v1.0.5 h1:EJu3wtLZcA0HCvsZpX5yuD193/sW9tHiNvrEM5apXMk= +github.com/mongodb-forks/digest v1.0.5/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= @@ -2629,8 +2631,8 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -2762,8 +2764,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2795,8 +2797,8 @@ github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9k github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 h1:Y7xOFbD+3jaPw+VN7lkakNJ/pa+ZSQVFp1ONtJaBxns= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/scalyr/dataset-go v0.12.1 h1:B8xw2+HOW4B2i4BMEJyLhMcSEc35snjdyVIgOr8+dwI= -github.com/scalyr/dataset-go v0.12.1/go.mod h1:6Go51mPPv3TminPxEcbpmVki/UzXaMcrL4bseyziilQ= +github.com/scalyr/dataset-go v0.14.0 h1:uRkoUt6LcMcH3VUTjOakQ4aq+1ooJB2t47oqYRUkV/k= +github.com/scalyr/dataset-go v0.14.0/go.mod h1:+a4BvVyS7mKquK7ySuWh4vygyDBREQrdikdcnABYKFw= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2843,8 +2845,8 @@ github.com/signalfx/sapm-proto v0.13.0 h1:yEkp1+MAU4vZvnJMp56uhVlRjlvCK7KQjBg0g2 github.com/signalfx/sapm-proto v0.13.0/go.mod h1:C72HjeCW5v0Llk6pIVJ/ZH8A5GbiZpCCSkE1dSlpWxY= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 h1:FCyZbLP9tqrwca1CLRxosGCbBXzaL7oFXmEbrUbiwSM= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1/go.mod h1:92AQ/lCA08Aw2Eg8mgdIAak7IWyTbV5PZHocEO7vH0g= -github.com/sijms/go-ora/v2 v2.7.11 h1:RqyIXtTyIavMfQWAB/pRPbCo3m9daS4ks7sHzWSweaA= -github.com/sijms/go-ora/v2 v2.7.11/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.7.15 h1:39rGXS0lC3RzxcrlmfkrBAHzD6OKF+m3RI7VIyht6Ds= +github.com/sijms/go-ora/v2 v2.7.15/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -2961,8 +2963,8 @@ github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 h1:Owbauh0pI5HNddLgoozHEgwZMMXh1WL2fDhRZTMHcmg= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 h1:2e3mYN464zl3jaCIDb/CcKEYi7hW22MsdJqBGknjq0U= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs= github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= @@ -3240,8 +3242,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.3 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0/go.mod h1:HSmzQvagH8pS2/xrK7ScWsk0vAMtRTGbMFgInXCi8Tc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0/go.mod h1:U5rUt7Rw6zuORsWNfpMRy8XMNKLrmIlv/4HgLVW/d5M= @@ -3266,8 +3268,9 @@ go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -3308,8 +3311,9 @@ go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= @@ -3320,8 +3324,9 @@ go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= @@ -3338,8 +3343,9 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= @@ -3562,7 +3568,6 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -3974,8 +3979,9 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= @@ -4020,8 +4026,8 @@ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60c google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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= @@ -4315,8 +4321,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= @@ -4325,8 +4331,8 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -4338,8 +4344,8 @@ k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= @@ -4370,8 +4376,9 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kms v0.26.2/go.mod h1:69qGnf1NsFOQP07fBYqNLZklqEHSJF024JqYCaeVxHg= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= @@ -4380,8 +4387,8 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/kubelet v0.27.4 h1:P8+MoRx4ikcAc5eEa3k2A6kd8AXtoDRaoC8KX2HFZe4= k8s.io/kubelet v0.27.4/go.mod h1:2y4peCA57vKEhBcDL6Q5EkPuGP7FFxj9U41NV9hk1ac= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= @@ -4393,8 +4400,8 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index db2644929a7b..149c30e12cff 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -68,7 +68,7 @@ require ( github.com/antonmedv/expr v1.13.0 // indirect github.com/apache/thrift v0.18.1 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -110,8 +110,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -232,11 +232,11 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect @@ -245,10 +245,10 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.1 // indirect @@ -263,8 +263,8 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index 8a494f152035..4cec69ae878f 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -728,8 +728,8 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -1455,14 +1455,15 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2660,8 +2661,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.3 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0/go.mod h1:HSmzQvagH8pS2/xrK7ScWsk0vAMtRTGbMFgInXCi8Tc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0/go.mod h1:U5rUt7Rw6zuORsWNfpMRy8XMNKLrmIlv/4HgLVW/d5M= @@ -2686,8 +2687,9 @@ go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -2728,8 +2730,9 @@ go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= @@ -2740,8 +2743,9 @@ go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= @@ -2758,8 +2762,9 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= @@ -3363,8 +3368,9 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= @@ -3408,8 +3414,8 @@ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60c google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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= diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod index 866afedf11ae..f540729a480a 100644 --- a/cmd/telemetrygen/go.mod +++ b/cmd/telemetrygen/go.mod @@ -10,15 +10,15 @@ require ( go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/semconv v0.83.0 - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 - go.opentelemetry.io/otel/sdk/metric v0.39.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 + go.opentelemetry.io/otel/sdk v1.17.0 + go.opentelemetry.io/otel/sdk/metric v0.40.0 + go.opentelemetry.io/otel/trace v1.17.0 go.uber.org/zap v1.25.0 golang.org/x/time v0.3.0 google.golang.org/grpc v1.57.0 @@ -45,10 +45,9 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect go.opentelemetry.io/collector/confmap v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum index eb52a00aa3f5..2ac20160f5b5 100644 --- a/cmd/telemetrygen/go.sum +++ b/cmd/telemetrygen/go.sum @@ -1,39 +1,6 @@ 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= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -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/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -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/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -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= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -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= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -63,19 +30,10 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -86,19 +44,13 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-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-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -118,24 +70,12 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -150,38 +90,22 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/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/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.4.1/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.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -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/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/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -218,7 +142,6 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -230,8 +153,6 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -317,7 +238,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -327,7 +247,6 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -341,19 +260,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opencensus.io v0.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.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/collector/component v0.83.0 h1:7bMbOHQezVx9RhSLu9KQRBhjXmO+CbOVhBk5uySb0fY= go.opentelemetry.io/collector/component v0.83.0/go.mod h1:Qy2mIP32UKN1x8rsjJbkgB9obAVu4hRusc1wKNFeV+o= go.opentelemetry.io/collector/config/configtelemetry v0.83.0 h1:Dx+POy68CFsec9JDYd7cxQPULLfSOAG8ma5Jl3ZZ3+Y= @@ -366,33 +278,30 @@ go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L5 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+Fizi7lTM2UefJ1TO347fSRcwmIsUAaZmYmIGBRAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 h1:IZXpCEtI7BbX01DRQEWTGDkvjMB6hEhiEZXS+eg2YqY= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 h1:SZaSbubADNhH2Gxm+1GaZ/cFsGiYefZoodMMX79AOd4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0/go.mod h1:N65FzQDfQH7NY7umgb0U+7ypGKVYKwwE24L6KXT4OA8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= +go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= +go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -405,40 +314,16 @@ go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -449,27 +334,11 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/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-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -479,18 +348,13 @@ golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= 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= -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-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -501,41 +365,21 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-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-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -548,9 +392,7 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -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= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -558,116 +400,34 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= @@ -675,23 +435,13 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= 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.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.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= 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.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -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.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -702,11 +452,9 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/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= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -715,7 +463,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -730,13 +477,5 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C 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-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -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= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/cmd/telemetrygen/internal/logs/config.go b/cmd/telemetrygen/internal/logs/config.go index ca1c35762138..a071e7f86ce1 100644 --- a/cmd/telemetrygen/internal/logs/config.go +++ b/cmd/telemetrygen/internal/logs/config.go @@ -13,10 +13,12 @@ import ( type Config struct { common.Config NumLogs int + Body string } // Flags registers config flags. func (c *Config) Flags(fs *pflag.FlagSet) { c.CommonFlags(fs) fs.IntVar(&c.NumLogs, "logs", 1, "Number of logs to generate in each worker (ignored if duration is provided)") + fs.StringVar(&c.Body, "body", "the message", "Body of the log") } diff --git a/cmd/telemetrygen/internal/logs/logs.go b/cmd/telemetrygen/internal/logs/logs.go index 492e00198ef5..96345df3310e 100644 --- a/cmd/telemetrygen/internal/logs/logs.go +++ b/cmd/telemetrygen/internal/logs/logs.go @@ -97,6 +97,7 @@ func Run(c *Config, exp exporter, logger *zap.Logger) error { w := worker{ numLogs: c.NumLogs, limitPerSecond: limit, + body: c.Body, totalDuration: c.TotalDuration, running: running, wg: &wg, diff --git a/cmd/telemetrygen/internal/logs/worker.go b/cmd/telemetrygen/internal/logs/worker.go index 492e51a4710f..31de631b166f 100644 --- a/cmd/telemetrygen/internal/logs/worker.go +++ b/cmd/telemetrygen/internal/logs/worker.go @@ -19,6 +19,7 @@ import ( type worker struct { running *atomic.Bool // pointer to shared flag that indicates it's time to stop the test numLogs int // how many logs the worker has to generate (only when duration==0) + body string // the body of the log totalDuration time.Duration // how long to run the test for (overrides `numLogs`) limitPerSecond rate.Limit // how many logs per second to generate wg *sync.WaitGroup // notify when done @@ -38,6 +39,7 @@ func (w worker) simulateLogs(res *resource.Resource, exporter exporter) { nRes.Attributes().PutStr(string(attr.Key), attr.Value.AsString()) } log := logs.ResourceLogs().At(0).ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() + log.Body().SetStr(w.body) log.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) log.SetDroppedAttributesCount(1) log.SetSeverityNumber(plog.SeverityNumberInfo) diff --git a/cmd/telemetrygen/internal/logs/worker_test.go b/cmd/telemetrygen/internal/logs/worker_test.go index 1b08ade992eb..912b031ab612 100644 --- a/cmd/telemetrygen/internal/logs/worker_test.go +++ b/cmd/telemetrygen/internal/logs/worker_test.go @@ -79,3 +79,20 @@ func TestUnthrottled(t *testing.T) { assert.True(t, len(exp.logs) > 100, "there should have been more than 100 logs, had %d", len(exp.logs)) } + +func TestCustomBody(t *testing.T) { + cfg := &Config{ + Body: "custom body", + NumLogs: 1, + Config: common.Config{ + WorkerCount: 1, + }, + } + exp := &mockExporter{} + + // test + logger, _ := zap.NewDevelopment() + require.NoError(t, Run(cfg, exp, logger)) + + assert.Equal(t, "custom body", exp.logs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().AsString()) +} diff --git a/cmd/telemetrygen/internal/metrics/worker_test.go b/cmd/telemetrygen/internal/metrics/worker_test.go index 7a6d708da451..832d8aa914bc 100644 --- a/cmd/telemetrygen/internal/metrics/worker_test.go +++ b/cmd/telemetrygen/internal/metrics/worker_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" sdkmetric "go.opentelemetry.io/otel/sdk/metric" - "go.opentelemetry.io/otel/sdk/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.uber.org/zap" @@ -26,8 +25,8 @@ func (m *mockExporter) Temporality(_ sdkmetric.InstrumentKind) metricdata.Tempor return metricdata.DeltaTemporality } -func (m *mockExporter) Aggregation(_ sdkmetric.InstrumentKind) aggregation.Aggregation { - return aggregation.Default{} +func (m *mockExporter) Aggregation(_ sdkmetric.InstrumentKind) sdkmetric.Aggregation { + return sdkmetric.AggregationDefault{} } func (m *mockExporter) Export(_ context.Context, metrics *metricdata.ResourceMetrics) error { diff --git a/cmd/telemetrygen/internal/traces/config.go b/cmd/telemetrygen/internal/traces/config.go index 2a8dbc77b53b..2ffb44fcc3cb 100644 --- a/cmd/telemetrygen/internal/traces/config.go +++ b/cmd/telemetrygen/internal/traces/config.go @@ -26,7 +26,7 @@ func (c *Config) Flags(fs *pflag.FlagSet) { fs.IntVar(&c.NumTraces, "traces", 1, "Number of traces to generate in each worker (ignored if duration is provided)") fs.BoolVar(&c.PropagateContext, "marshal", false, "Whether to marshal trace context via HTTP headers") fs.StringVar(&c.ServiceName, "service", "telemetrygen", "Service name to use") - fs.StringVar(&c.StatusCode, "status-code", "Unset", "Status code to use for the spans, one of (Unset, Error, Ok) or the equivalent integer (0,1,2)") + fs.StringVar(&c.StatusCode, "status-code", "0", "Status code to use for the spans, one of (Unset, Error, Ok) or the equivalent integer (0,1,2)") fs.BoolVar(&c.Batch, "batch", true, "Whether to batch traces") fs.IntVar(&c.LoadSize, "size", 0, "Desired minimum size in MB of string data for each trace generated. This can be used to test traces with large payloads, i.e. when testing the OTLP receiver endpoint max receive size.") } diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 8206de54bcdb..8330fb2a4f1b 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provide go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.20.1 - github.com/aws/aws-sdk-go-v2/config v1.18.33 + github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2/config v1.18.36 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/confmap v0.83.0 @@ -13,18 +13,18 @@ require ( require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index dac329090956..c107adcd9ea4 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -13,51 +13,51 @@ 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-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.11.0/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 h1:yVUAwvJC/0WNPbyl0nA3j1L6CW1CN8wBubCRqtG7JLI= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0/go.mod h1:Xn6sxgRuIDflLRJFj5Ev7UxABIkNbccFPV/p8itDReM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= -github.com/aws/aws-sdk-go-v2/config v1.18.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.0/go.mod h1:NO3Q5ZTTQtO2xIg2+xTXYDiT7knSejfeDm7WGDaOo0U= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.0/go.mod h1:anlUzBoEWglcUxUQwZA7HQOEVEnQALVZsizAapB2hq8= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 h1:lPLbw4Gn59uoKqvOfSnkJr54XWk5Ak1NK20ZEiSWb3U= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0/go.mod h1:80NaCIH9YU3rzTTs/J/ECATjXuRqzo/wB6ukO6MZ0XY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.0/go.mod h1:Mq6AEc+oEjCUlBuLiK5YwW4shSOAKCQ3tXN0sQeYoBA= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 h1:0BOlTqnNnrEO04oYKzDxMMe68t107pmIotn18HtVonY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0/go.mod h1:xKCZ4YFSF2s4Hnb/J0TLeOsKuGzICzcElaOKNGrVnx4= github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 h1:5mRAms4TjSTOGYsqKYte5kHr1PzpMJSyLThjF3J+hw0= github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0/go.mod h1:Gwz3aVctJe6mUY9T//bcALArPUaFmNAy2rTB9qN4No8= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.9.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod index fc2d35d13a6f..965e03449d94 100644 --- a/connector/countconnector/go.mod +++ b/connector/countconnector/go.mod @@ -25,7 +25,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index 4ee92cb4ac62..8d8779b338e9 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -104,8 +104,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/connector/datadogconnector/README.md b/connector/datadogconnector/README.md index 5644351d5a26..27f68b4fa61e 100644 --- a/connector/datadogconnector/README.md +++ b/connector/datadogconnector/README.md @@ -1,5 +1,25 @@ # Datadog Connector + +| Status | | +| ------------- |-----------| +| Distributions | [] | +| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fdatadog%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fdatadog) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fdatadog%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fdatadog) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mx-psi](https://www.github.com/mx-psi), [@gbbr](https://www.github.com/gbbr), [@dineshg13](https://www.github.com/dineshg13) | + +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha + +## Supported Pipeline Types + +| [Exporter Pipeline Type] | [Receiver Pipeline Type] | [Stability Level] | +| ------------------------ | ------------------------ | ----------------- | +| traces | metrics | [alpha] | + +[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type +[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type +[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels + + ## Description The Datadog Connector is a connector component that computes Datadog APM Stats pre-sampling in the event that your traces pipeline is sampled using components such as the tailsamplingprocessor or probabilisticsamplerprocessor. @@ -82,4 +102,3 @@ service: Here we have two traces pipelines that ingest the same data but one is being sampled. The one that is sampled has its data sent to the datadog backend for you to see the sampled subset of the total traces sent across. The other non-sampled pipeline of traces sends its data to the metrics pipeline to be used in the APM stats. This unsampled pipeline gives the full picture of how much data the application emits in traces. - diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 011ab6318454..7a526b317409 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -40,7 +40,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 37fb5e5fff3d..1bc4288f67ef 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -151,8 +151,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ 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.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index d054aa1af4a4..e38732bc69dc 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -19,7 +19,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index 3a12b6acb7da..1af2ba748070 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -803,8 +803,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index 263d24d7fb11..de287674823b 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -106,7 +106,7 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -451,7 +451,7 @@ 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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= 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= diff --git a/examples/demo/client/go.mod b/examples/demo/client/go.mod index a4d530a04b62..c467c13c8f90 100644 --- a/examples/demo/client/go.mod +++ b/examples/demo/client/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 - go.opentelemetry.io/otel/metric v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 - go.opentelemetry.io/otel/sdk/metric v0.39.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 + go.opentelemetry.io/otel/metric v1.17.0 + go.opentelemetry.io/otel/sdk v1.17.0 + go.opentelemetry.io/otel/sdk/metric v0.40.0 google.golang.org/grpc v1.57.0 ) @@ -21,10 +21,9 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect diff --git a/examples/demo/client/go.sum b/examples/demo/client/go.sum index 263ed8eeeca2..bf38d894dce5 100644 --- a/examples/demo/client/go.sum +++ b/examples/demo/client/go.sum @@ -1,459 +1,62 @@ -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= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -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/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -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/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -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= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -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= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -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/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/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.4.1/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.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -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/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -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.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -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.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+Fizi7lTM2UefJ1TO347fSRcwmIsUAaZmYmIGBRAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= +go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= +go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/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/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/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-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -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= -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-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -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= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -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= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/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/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= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e h1:S83+ibolgyZ0bqz7KEsUOPErxcv4VzlszxY+31OfB/E= google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -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.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.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -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.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/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= -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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -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= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/examples/demo/server/go.mod b/examples/demo/server/go.mod index 6f65187d8b9a..bd03b4e0982b 100644 --- a/examples/demo/server/go.mod +++ b/examples/demo/server/go.mod @@ -4,14 +4,14 @@ go 1.20 require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 - go.opentelemetry.io/otel/metric v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 - go.opentelemetry.io/otel/sdk/metric v0.39.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 + go.opentelemetry.io/otel/metric v1.17.0 + go.opentelemetry.io/otel/sdk v1.17.0 + go.opentelemetry.io/otel/sdk/metric v0.40.0 + go.opentelemetry.io/otel/trace v1.17.0 google.golang.org/grpc v1.57.0 ) @@ -22,9 +22,8 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect diff --git a/examples/demo/server/go.sum b/examples/demo/server/go.sum index 263ed8eeeca2..bf38d894dce5 100644 --- a/examples/demo/server/go.sum +++ b/examples/demo/server/go.sum @@ -1,459 +1,62 @@ -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= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -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/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -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/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -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= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -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= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -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/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/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.4.1/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.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -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/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 h1:dygLcbEBA+t/P7ck6a8AkXv6juQ4cK0RHBoh32jxhHM= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2/go.mod h1:Ap9RLCIJVtgQg1/BBgVEfypOAySvvlcpcVQkSzJCH4Y= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -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.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -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.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+Fizi7lTM2UefJ1TO347fSRcwmIsUAaZmYmIGBRAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= +go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= +go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/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/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/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-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -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= -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-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -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= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -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= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/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/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= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e h1:S83+ibolgyZ0bqz7KEsUOPErxcv4VzlszxY+31OfB/E= google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -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.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.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -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.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/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= -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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -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= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index db98018f2d6f..cbc4d8ba1eb2 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibab go 1.20 require ( - github.com/aliyun/aliyun-log-go-sdk v0.1.51 + github.com/aliyun/aliyun-log-go-sdk v0.1.53 github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index bb248c82a894..a700fd7068d9 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -3,6 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d h1:wvStE9wLpws31NiWUx+38wny1msZ/tm+eL5xmm4Y7So= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d/go.mod h1:9XMFaCeRyW7fC9XJOWQ+NdAv8VLG7ys7l3x4ozEGLUQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -12,8 +14,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/aliyun/aliyun-log-go-sdk v0.1.51 h1:XEtzCGEUY2QAkMVy/5YoP/vlb9tDZdaaBnbAKlvaLVU= -github.com/aliyun/aliyun-log-go-sdk v0.1.51/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= +github.com/aliyun/aliyun-log-go-sdk v0.1.53 h1:3kI+QASsOzxLI4Ij8LBOmRR+6zFIp1mlAdfOAdkiI8k= +github.com/aliyun/aliyun-log-go-sdk v0.1.53/go.mod h1:/U0mxwX7uG2K2fbfsF92BR64zmbmJyx7WQtyKaCdRL8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go index 353a7164ccaf..a9b06e755012 100644 --- a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go @@ -269,8 +269,9 @@ func doubleSummaryMetricsToLogs(name string, data pmetric.SummaryDataPointSlice, } func metricDataToLogServiceData(md pmetric.Metric, defaultLabels KeyValues) (logs []*sls.Log) { + //exhaustive:enforce switch md.Type() { - case pmetric.MetricTypeEmpty: + case pmetric.MetricTypeEmpty, pmetric.MetricTypeExponentialHistogram: break case pmetric.MetricTypeGauge: return numberMetricsToLogs(md.Name(), md.Gauge().DataPoints(), defaultLabels) diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 61405ef6b313..de36347dcf8d 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index a7bffa51c21a..a371388d2d7c 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -12,8 +12,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -106,8 +106,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 3f3b869818a1..8cd3b7cc26c7 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemf go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 - github.com/google/uuid v1.3.0 + github.com/aws/aws-sdk-go v1.44.329 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.83.0 diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 20f7b304d194..b6be3d1b7082 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -12,8 +12,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -106,8 +106,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 8ff940d4f3a7..228cd056b57d 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskin go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.20.1 - github.com/aws/aws-sdk-go-v2/config v1.18.33 - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2 - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 + github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2/config v1.18.36 + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 github.com/cenkalti/backoff/v4 v4.2.1 github.com/gogo/protobuf v1.3.2 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.83.0 @@ -26,15 +26,15 @@ require ( require ( github.com/apache/thrift v0.18.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index bc7d521c26d2..2c50e5fda023 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -16,43 +16,43 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= -github.com/aws/aws-sdk-go-v2/config v1.18.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2/go.mod h1:7YAKee7SYksF6IAwXXuZ7bp4EIUBRJDysKZneqtspPM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -138,8 +138,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/exporter/awss3exporter/go.mod b/exporter/awss3exporter/go.mod index a9e2a0f11604..60037be68a08 100644 --- a/exporter/awss3exporter/go.mod +++ b/exporter/awss3exporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3e go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.83.0 go.opentelemetry.io/collector/component v0.83.0 @@ -28,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -83,7 +83,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/exporter/awss3exporter/go.sum b/exporter/awss3exporter/go.sum index 06ca607b93e1..fd61831ab6e9 100644 --- a/exporter/awss3exporter/go.sum +++ b/exporter/awss3exporter/go.sum @@ -47,8 +47,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -195,8 +195,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -726,8 +726,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go index 48b2752f0055..6cd3e77be21a 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -109,7 +109,8 @@ func extractResourceSpans(config component.Config, logger *zap.Logger, td ptrace spans.At(k), resource, config.(*Config).IndexedAttributes, config.(*Config).IndexAllAttributes, - config.(*Config).LogGroupNames) + config.(*Config).LogGroupNames, + config.(*Config).skipTimestampValidation) if localErr != nil { logger.Debug("Error translating span.", zap.Error(localErr)) continue diff --git a/exporter/awsxrayexporter/config.go b/exporter/awsxrayexporter/config.go index 55e8c6e1772e..294ace13346f 100644 --- a/exporter/awsxrayexporter/config.go +++ b/exporter/awsxrayexporter/config.go @@ -24,4 +24,7 @@ type Config struct { LogGroupNames []string `mapstructure:"aws_log_groups"` // TelemetryConfig contains the options for telemetry collection. TelemetryConfig telemetry.Config `mapstructure:"telemetry,omitempty"` + + // skipTimestampValidation if enabled, will skip timestamp validation logic on the trace ID + skipTimestampValidation bool } diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index 49a8eef2988a..d4e232de4451 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -45,9 +45,10 @@ func TestLoadConfig(t *testing.T) { ResourceARN: "arn:aws:ec2:us-east1:123456789:instance/i-293hiuhe0u", RoleARN: "arn:aws:iam::123456789:role/monitoring-EKS-NodeInstanceRole", }, - IndexedAttributes: []string{"indexed_attr_0", "indexed_attr_1"}, - IndexAllAttributes: false, - LogGroupNames: []string{"group1", "group2"}, + IndexedAttributes: []string{"indexed_attr_0", "indexed_attr_1"}, + IndexAllAttributes: false, + LogGroupNames: []string{"group1", "group2"}, + skipTimestampValidation: false, }, }, } diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index 8d0d689b694d..258f086bf26e 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -8,12 +8,19 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry" ) +var skipTimestampValidationFeatureGate = featuregate.GlobalRegistry().MustRegister( + "exporter.awsxray.skiptimestampvalidation", + featuregate.StageAlpha, + featuregate.WithRegisterDescription("Remove XRay's timestamp validation on first 32 bits of trace ID"), + featuregate.WithRegisterFromVersion("v0.84.0")) + // NewFactory creates a factory for AWS-Xray exporter. func NewFactory() exporter.Factory { return exporter.NewFactory( @@ -24,7 +31,8 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), + AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), + skipTimestampValidation: skipTimestampValidationFeatureGate.IsEnabled(), } } diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index 460827738528..e457f5abe17f 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" @@ -35,10 +36,39 @@ func TestCreateDefaultConfig(t *testing.T) { ResourceARN: "", RoleARN: "", }, + skipTimestampValidation: false, }, "failed to create default config") assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } +func TestCreateDefaultConfigWithSkipTimestampValidation(t *testing.T) { + factory := NewFactory() + + err := featuregate.GlobalRegistry().Set("exporter.awsxray.skiptimestampvalidation", true) + assert.NoError(t, err) + + cfg := factory.CreateDefaultConfig() + assert.Equal(t, cfg, &Config{ + AWSSessionSettings: awsutil.AWSSessionSettings{ + NumberOfWorkers: 8, + Endpoint: "", + RequestTimeoutSeconds: 30, + MaxRetries: 2, + NoVerifySSL: false, + ProxyAddress: "", + Region: "", + LocalMode: false, + ResourceARN: "", + RoleARN: "", + }, + skipTimestampValidation: true, + }, "failed to create default config") + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) + + err = featuregate.GlobalRegistry().Set("exporter.awsxray.skiptimestampvalidation", false) + assert.NoError(t, err) +} + func TestCreateTracesExporter(t *testing.T) { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index ece97b3c3bf9..bed0ad4a5698 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/confmap v0.83.0 go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/exporter v0.83.0 + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/semconv v0.83.0 go.uber.org/zap v1.25.0 @@ -36,7 +37,6 @@ require ( go.opentelemetry.io/collector v0.83.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect go.opentelemetry.io/collector/extension v0.83.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/collector/receiver v0.83.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 12130e232848..ada17ad23fb5 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -12,8 +12,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/exporter/awsxrayexporter/internal/translator/segment.go b/exporter/awsxrayexporter/internal/translator/segment.go index 3438e412f7bd..106b88856519 100644 --- a/exporter/awsxrayexporter/internal/translator/segment.go +++ b/exporter/awsxrayexporter/internal/translator/segment.go @@ -62,8 +62,8 @@ var ( ) // MakeSegmentDocumentString converts an OpenTelemetry Span to an X-Ray Segment and then serialzies to JSON -func MakeSegmentDocumentString(span ptrace.Span, resource pcommon.Resource, indexedAttrs []string, indexAllAttrs bool, logGroupNames []string) (string, error) { - segment, err := MakeSegment(span, resource, indexedAttrs, indexAllAttrs, logGroupNames) +func MakeSegmentDocumentString(span ptrace.Span, resource pcommon.Resource, indexedAttrs []string, indexAllAttrs bool, logGroupNames []string, skipTimestampValidation bool) (string, error) { + segment, err := MakeSegment(span, resource, indexedAttrs, indexAllAttrs, logGroupNames, skipTimestampValidation) if err != nil { return "", err } @@ -77,7 +77,7 @@ func MakeSegmentDocumentString(span ptrace.Span, resource pcommon.Resource, inde } // MakeSegment converts an OpenTelemetry Span to an X-Ray Segment -func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []string, indexAllAttrs bool, logGroupNames []string) (*awsxray.Segment, error) { +func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []string, indexAllAttrs bool, logGroupNames []string, skipTimestampValidation bool) (*awsxray.Segment, error) { var segmentType string storeResource := true @@ -89,7 +89,7 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str } // convert trace id - traceID, err := convertToAmazonTraceID(span.TraceID()) + traceID, err := convertToAmazonTraceID(span.TraceID(), skipTimestampValidation) if err != nil { return nil, err } @@ -107,7 +107,7 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str sqlfiltered, sql = makeSQL(span, awsfiltered) additionalAttrs = addSpecialAttributes(sqlfiltered, indexedAttrs, attributes) user, annotations, metadata = makeXRayAttributes(additionalAttrs, resource, storeResource, indexedAttrs, indexAllAttrs) - spanLinks, makeSpanLinkErr = makeSpanLinks(span.Links()) + spanLinks, makeSpanLinkErr = makeSpanLinks(span.Links(), skipTimestampValidation) name string namespace string ) @@ -295,7 +295,7 @@ func determineAwsOrigin(resource pcommon.Resource) string { // - For example, 10:00AM December 2nd, 2016 PST in epoch time is 1480615200 seconds, // or 58406520 in hexadecimal. // - A 96-bit identifier for the trace, globally unique, in 24 hexadecimal digits. -func convertToAmazonTraceID(traceID pcommon.TraceID) (string, error) { +func convertToAmazonTraceID(traceID pcommon.TraceID, skipTimestampValidation bool) (string, error) { const ( // maxAge of 28 days. AWS has a 30 day limit, let's be conservative rather than // hit the limit @@ -313,13 +313,16 @@ func convertToAmazonTraceID(traceID pcommon.TraceID) (string, error) { b = [4]byte{} ) - // If AWS traceID originally came from AWS, no problem. However, if oc generated - // the traceID, then the epoch may be outside the accepted AWS range of within the - // past 30 days. - // - // In that case, we return invalid traceid error - if delta := epochNow - epoch; delta > maxAge || delta < -maxSkew { - return "", fmt.Errorf("invalid xray traceid: %s", traceID) + // If feature gate is enabled, skip the timestamp validation logic + if !skipTimestampValidation { + // If AWS traceID originally came from AWS, no problem. However, if oc generated + // the traceID, then the epoch may be outside the accepted AWS range of within the + // past 30 days. + // + // In that case, we return invalid traceid error + if delta := epochNow - epoch; delta > maxAge || delta < -maxSkew { + return "", fmt.Errorf("invalid xray traceid: %s", traceID) + } } binary.BigEndian.PutUint32(b[0:4], uint32(epoch)) diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go index de26c676bfb4..147c98b4b1a8 100644 --- a/exporter/awsxrayexporter/internal/translator/segment_test.go +++ b/exporter/awsxrayexporter/internal/translator/segment_test.go @@ -50,13 +50,13 @@ func TestClientSpanWithRpcAwsSdkClientAttributes(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "DynamoDB", *segment.Name) assert.Equal(t, conventions.AttributeCloudProviderAWS, *segment.Namespace) assert.Equal(t, "GetItem", *segment.AWS.Operation) assert.Equal(t, "subsegment", *segment.Type) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) @@ -83,13 +83,13 @@ func TestClientSpanWithLegacyAwsSdkClientAttributes(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "DynamoDB", *segment.Name) assert.Equal(t, conventions.AttributeCloudProviderAWS, *segment.Namespace) assert.Equal(t, "GetItem", *segment.AWS.Operation) assert.Equal(t, "subsegment", *segment.Type) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) @@ -115,7 +115,7 @@ func TestClientSpanWithPeerService(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "cats-table", *segment.Name) } @@ -138,7 +138,7 @@ func TestServerSpanWithInternalServerError(t *testing.T) { timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp()) timeEvents.CopyTo(span.Events()) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.NotNil(t, segment.Cause) @@ -165,7 +165,7 @@ func TestServerSpanWithThrottle(t *testing.T) { timeEvents := constructTimedEventsWithSentMessageEvent(span.StartTimestamp()) timeEvents.CopyTo(span.Events()) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.NotNil(t, segment.Cause) @@ -181,7 +181,7 @@ func TestServerSpanNoParentId(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeOk, "OK", nil) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Empty(t, segment.ParentID) } @@ -196,7 +196,7 @@ func TestSpanNoParentId(t *testing.T) { span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(10))) resource := pcommon.NewResource() - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Empty(t, segment.ParentID) assert.Nil(t, segment.Type) @@ -212,7 +212,7 @@ func TestSpanWithNoStatus(t *testing.T) { span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now().Add(10))) resource := pcommon.NewResource() - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) } @@ -232,7 +232,7 @@ func TestClientSpanWithDbComponent(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, ptrace.StatusCodeUnset, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.NotNil(t, segment.SQL) @@ -270,7 +270,7 @@ func TestClientSpanWithHttpHost(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, ptrace.StatusCodeUnset, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, "foo.com", *segment.Name) @@ -289,7 +289,7 @@ func TestClientSpanWithoutHttpHost(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, ptrace.StatusCodeUnset, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, "bar.com", *segment.Name) @@ -309,7 +309,7 @@ func TestClientSpanWithRpcHost(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, ptrace.StatusCodeUnset, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, "com.foo.AnimalService", *segment.Name) @@ -331,7 +331,7 @@ func TestSpanWithInvalidTraceId(t *testing.T) { traceID[0] = 0x11 span.SetTraceID(traceID) - _, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + _, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, err) } @@ -344,10 +344,56 @@ func TestSpanWithExpiredTraceId(t *testing.T) { tempTraceID := newTraceID() binary.BigEndian.PutUint32(tempTraceID[0:4], uint32(ExpiredEpoch)) - _, err := convertToAmazonTraceID(tempTraceID) + _, err := convertToAmazonTraceID(tempTraceID, false) assert.NotNil(t, err) } +func TestSpanWithInvalidTraceIdWithoutTimestampValidation(t *testing.T) { + spanName := "ABC.payment" + parentSpanID := newSegmentID() + user := "testingT" + attributes := make(map[string]interface{}) + attributes[conventions.AttributeHTTPMethod] = "POST" + attributes[conventions.AttributeHTTPScheme] = "https" + attributes[conventions.AttributeHTTPHost] = "payment.amazonaws.com" + attributes[conventions.AttributeHTTPTarget] = "/" + attributes[conventions.AttributeRPCService] = "ABC" + attributes[awsRemoteService] = "ProducerService" + + resource := constructDefaultResource() + span := constructProducerSpan(parentSpanID, spanName, 0, "OK", attributes) + traceID := span.TraceID() + traceID[0] = 0x11 + span.SetTraceID(traceID) + + segment, err := MakeSegment(span, resource, nil, false, nil, true) + require.Nil(t, err) + assert.Equal(t, "ProducerService", *segment.Name) + assert.Equal(t, "subsegment", *segment.Type) + + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, true) + + require.Nil(t, err) + assert.NotNil(t, jsonStr) + assert.True(t, strings.Contains(jsonStr, "ProducerService")) + assert.False(t, strings.Contains(jsonStr, user)) + assert.False(t, strings.Contains(jsonStr, "user")) +} + +func TestSpanWithExpiredTraceIdWithoutTimestampValidation(t *testing.T) { + // First Build expired TraceId + const maxAge = 60 * 60 * 24 * 30 + ExpiredEpoch := time.Now().Unix() - maxAge - 1 + + tempTraceID := newTraceID() + binary.BigEndian.PutUint32(tempTraceID[0:4], uint32(ExpiredEpoch)) + + amazonTraceID, err := convertToAmazonTraceID(tempTraceID, true) + assert.Nil(t, err) + expectedTraceID := "1-" + fmt.Sprintf("%x", tempTraceID[0:4]) + "-" + fmt.Sprintf("%x", tempTraceID[4:16]) + assert.Equal(t, expectedTraceID, amazonTraceID) +} + func TestFixSegmentName(t *testing.T) { validName := "EP @ test_15.testing-d\u00F6main.org#GO" fixedName := fixSegmentName(validName) @@ -379,7 +425,7 @@ func TestServerSpanWithNilAttributes(t *testing.T) { timeEvents.CopyTo(span.Events()) pcommon.NewMap().CopyTo(span.Attributes()) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.NotNil(t, segment.Cause) @@ -396,7 +442,7 @@ func TestSpanWithAttributesDefaultNotIndexed(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 0, len(segment.Annotations)) @@ -423,7 +469,7 @@ func TestSpanWithResourceNotStoredIfSubsegment(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, ptrace.StatusCodeError, "ERROR", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 0, len(segment.Annotations)) @@ -446,7 +492,7 @@ func TestSpanWithAttributesPartlyIndexed(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{"attr1@1", "not_exist"}, false, nil) + segment, _ := MakeSegment(span, resource, []string{"attr1@1", "not_exist"}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 1, len(segment.Annotations)) @@ -464,7 +510,7 @@ func TestSpanWithAnnotationsAttribute(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 1, len(segment.Annotations)) @@ -481,7 +527,7 @@ func TestSpanWithAttributesAllIndexed(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeOk, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{"attr1@1", "not_exist"}, true, nil) + segment, _ := MakeSegment(span, resource, []string{"attr1@1", "not_exist"}, true, nil, false) assert.NotNil(t, segment) assert.Equal(t, "val1", segment.Annotations["attr1_1"]) @@ -502,7 +548,7 @@ func TestResourceAttributesCanBeIndexed(t *testing.T) { "otel.resource.bool.key", "otel.resource.map.key", "otel.resource.array.key", - }, false, nil) + }, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 4, len(segment.Annotations)) @@ -534,7 +580,7 @@ func TestResourceAttributesNotIndexedIfSubsegment(t *testing.T) { "otel.resource.bool.key", "otel.resource.map.key", "otel.resource.array.key", - }, false, nil) + }, false, nil, false) assert.NotNil(t, segment) assert.Empty(t, segment.Annotations) @@ -550,7 +596,7 @@ func TestSpanWithSpecialAttributesAsListed(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{awsxray.AWSOperationAttribute, conventions.AttributeRPCMethod}, false, nil) + segment, _ := MakeSegment(span, resource, []string{awsxray.AWSOperationAttribute, conventions.AttributeRPCMethod}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, 2, len(segment.Annotations)) @@ -567,7 +613,7 @@ func TestSpanWithSpecialAttributesAsListedAndIndexAll(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{awsxray.AWSOperationAttribute, conventions.AttributeRPCMethod}, true, nil) + segment, _ := MakeSegment(span, resource, []string{awsxray.AWSOperationAttribute, conventions.AttributeRPCMethod}, true, nil, false) assert.NotNil(t, segment) assert.Equal(t, "aws_operation_val", segment.Annotations["aws_operation"]) @@ -583,7 +629,7 @@ func TestSpanWithSpecialAttributesNotListedAndIndexAll(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, true, nil) + segment, _ := MakeSegment(span, resource, nil, true, nil, false) assert.NotNil(t, segment) assert.Nil(t, segment.Annotations["aws_operation"]) @@ -600,7 +646,7 @@ func TestOriginNotAws(t *testing.T) { attrs.PutStr(conventions.AttributeHostID, "instance-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Nil(t, segment.Origin) @@ -617,7 +663,7 @@ func TestOriginEc2(t *testing.T) { attrs.PutStr(conventions.AttributeHostID, "instance-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginEC2, *segment.Origin) @@ -635,7 +681,7 @@ func TestOriginEcs(t *testing.T) { attrs.PutStr(conventions.AttributeContainerName, "container-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginECS, *segment.Origin) @@ -654,7 +700,7 @@ func TestOriginEcsEc2(t *testing.T) { attrs.PutStr(conventions.AttributeContainerName, "container-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginECSEC2, *segment.Origin) @@ -673,7 +719,7 @@ func TestOriginEcsFargate(t *testing.T) { attrs.PutStr(conventions.AttributeContainerName, "container-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginECSFargate, *segment.Origin) @@ -692,7 +738,7 @@ func TestOriginEb(t *testing.T) { attrs.PutStr(conventions.AttributeServiceInstanceID, "service-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginEB, *segment.Origin) @@ -723,7 +769,7 @@ func TestOriginEks(t *testing.T) { attrs.PutStr(conventions.AttributeHostType, "m5.xlarge") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginEKS, *segment.Origin) @@ -739,7 +785,7 @@ func TestOriginAppRunner(t *testing.T) { attrs.PutStr(conventions.AttributeCloudPlatform, conventions.AttributeCloudPlatformAWSAppRunner) span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginAppRunner, *segment.Origin) @@ -754,7 +800,7 @@ func TestOriginBlank(t *testing.T) { attrs.PutStr(conventions.AttributeCloudProvider, conventions.AttributeCloudProviderAWS) span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Nil(t, segment.Origin) @@ -774,7 +820,7 @@ func TestOriginPrefersInfraService(t *testing.T) { attrs.PutStr(conventions.AttributeServiceInstanceID, "service-123") span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, OriginEC2, *segment.Origin) @@ -804,7 +850,7 @@ func TestFilteredAttributesMetadata(t *testing.T) { mapValue.PutDouble("value1", -987.65) mapValue.PutBool("value2", true) - segment, _ := MakeSegment(span, resource, []string{}, false, nil) + segment, _ := MakeSegment(span, resource, []string{}, false, nil, false) assert.NotNil(t, segment) assert.Nil(t, segment.Metadata["default"]["null_value"]) @@ -827,7 +873,7 @@ func TestSpanWithSingleDynamoDBTableHasTableName(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Equal(t, "table1", *segment.AWS.TableName) @@ -843,7 +889,7 @@ func TestSpanWithMultipleDynamoDBTablesHasTableNames(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeError, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, segment) assert.Nil(t, segment.AWS.TableName) @@ -861,7 +907,7 @@ func TestSegmentWithLogGroupsFromConfig(t *testing.T) { timeEvents.CopyTo(span.Events()) pcommon.NewMap().CopyTo(span.Attributes()) - segment, _ := MakeSegment(span, resource, nil, false, []string{"my-logGroup-1"}) + segment, _ := MakeSegment(span, resource, nil, false, []string{"my-logGroup-1"}, false) cwl := []awsxray.LogGroupMetadata{{ LogGroup: awsxray.String("my-logGroup-1"), @@ -880,7 +926,7 @@ func TestSegmentWith2LogGroupsFromConfig(t *testing.T) { timeEvents.CopyTo(span.Events()) pcommon.NewMap().CopyTo(span.Attributes()) - segment, _ := MakeSegment(span, resource, nil, false, []string{"my-logGroup-1", "my-logGroup-2"}) + segment, _ := MakeSegment(span, resource, nil, false, []string{"my-logGroup-1", "my-logGroup-2"}, false) cwl := []awsxray.LogGroupMetadata{{ LogGroup: awsxray.String("my-logGroup-1"), @@ -906,11 +952,11 @@ func TestClientSpanWithAwsRemoteServiceName(t *testing.T) { resource := constructDefaultResource() span := constructClientSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "PaymentService", *segment.Name) assert.Equal(t, "subsegment", *segment.Type) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) @@ -934,11 +980,11 @@ func TestProducerSpanWithAwsRemoteServiceName(t *testing.T) { resource := constructDefaultResource() span := constructProducerSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "ProducerService", *segment.Name) assert.Equal(t, "subsegment", *segment.Type) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) @@ -962,10 +1008,10 @@ func TestConsumerSpanWithAwsRemoteServiceName(t *testing.T) { resource := constructDefaultResource() span := constructConsumerSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "ConsumerService", *segment.Name) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) @@ -990,10 +1036,10 @@ func TestServerSpanWithAwsLocalServiceName(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, 0, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, "PaymentLocalService", *segment.Name) - jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, err := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, jsonStr) assert.Nil(t, err) diff --git a/exporter/awsxrayexporter/internal/translator/span_links.go b/exporter/awsxrayexporter/internal/translator/span_links.go index cae2ed11b72e..3f22f586110a 100644 --- a/exporter/awsxrayexporter/internal/translator/span_links.go +++ b/exporter/awsxrayexporter/internal/translator/span_links.go @@ -10,7 +10,7 @@ import ( awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) -func makeSpanLinks(links ptrace.SpanLinkSlice) ([]awsxray.SpanLinkData, error) { +func makeSpanLinks(links ptrace.SpanLinkSlice, skipTimestampValidation bool) ([]awsxray.SpanLinkData, error) { var spanLinkDataArray []awsxray.SpanLinkData for i := 0; i < links.Len(); i++ { @@ -18,7 +18,7 @@ func makeSpanLinks(links ptrace.SpanLinkSlice) ([]awsxray.SpanLinkData, error) { var link = links.At(i) var spanID = link.SpanID().String() - traceID, err := convertToAmazonTraceID(link.TraceID()) + traceID, err := convertToAmazonTraceID(link.TraceID(), skipTimestampValidation) if err != nil { return nil, err diff --git a/exporter/awsxrayexporter/internal/translator/span_links_test.go b/exporter/awsxrayexporter/internal/translator/span_links_test.go index 1f7e4db54ca7..b16504a143c1 100644 --- a/exporter/awsxrayexporter/internal/translator/span_links_test.go +++ b/exporter/awsxrayexporter/internal/translator/span_links_test.go @@ -26,16 +26,16 @@ func TestSpanLinkSimple(t *testing.T) { spanLink.SetTraceID(traceID) spanLink.SetSpanID(newSegmentID()) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) - var convertedTraceID, _ = convertToAmazonTraceID(traceID) + var convertedTraceID, _ = convertToAmazonTraceID(traceID, false) assert.Equal(t, 1, len(segment.Links)) assert.Equal(t, spanLink.SpanID().String(), *segment.Links[0].SpanID) assert.Equal(t, convertedTraceID, *segment.Links[0].TraceID) assert.Equal(t, 0, len(segment.Links[0].Attributes)) - jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.True(t, strings.Contains(jsonStr, "links")) assert.False(t, strings.Contains(jsonStr, "attributes")) @@ -50,11 +50,11 @@ func TestSpanLinkEmpty(t *testing.T) { resource := constructDefaultResource() span := constructServerSpan(parentSpanID, spanName, ptrace.StatusCodeOk, "OK", attributes) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, 0, len(segment.Links)) - jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.False(t, strings.Contains(jsonStr, "links")) } @@ -76,11 +76,11 @@ func TestOldSpanLinkError(t *testing.T) { spanLink.SetTraceID(traceID) spanLink.SetSpanID(newSegmentID()) - _, error1 := MakeSegment(span, resource, nil, false, nil) + _, error1 := MakeSegment(span, resource, nil, false, nil, false) assert.NotNil(t, error1) - _, error2 := MakeSegmentDocumentString(span, resource, nil, false, nil) + _, error2 := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.NotNil(t, error2) } @@ -106,10 +106,10 @@ func TestTwoSpanLinks(t *testing.T) { spanLink2.SetSpanID(newSegmentID()) spanLink2.Attributes().PutInt("myKey2", 1234) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) - var convertedTraceID1, _ = convertToAmazonTraceID(traceID1) - var convertedTraceID2, _ = convertToAmazonTraceID(traceID2) + var convertedTraceID1, _ = convertToAmazonTraceID(traceID1, false) + var convertedTraceID2, _ = convertToAmazonTraceID(traceID2, false) assert.Equal(t, 2, len(segment.Links)) assert.Equal(t, spanLink1.SpanID().String(), *segment.Links[0].SpanID) @@ -123,7 +123,7 @@ func TestTwoSpanLinks(t *testing.T) { assert.Equal(t, 1, len(segment.Links[0].Attributes)) assert.Equal(t, int64(1234), segment.Links[1].Attributes["myKey2"]) - jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.True(t, strings.Contains(jsonStr, "attributes")) assert.True(t, strings.Contains(jsonStr, "links")) @@ -170,7 +170,7 @@ func TestSpanLinkComplexAttributes(t *testing.T) { slice4.AppendEmpty().SetDouble(2.718) slice4.AppendEmpty().SetDouble(1.618) - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) assert.Equal(t, 1, len(segment.Links)) assert.Equal(t, 8, len(segment.Links[0].Attributes)) @@ -196,7 +196,7 @@ func TestSpanLinkComplexAttributes(t *testing.T) { assert.Equal(t, 2.718, segment.Links[0].Attributes["myKey8"].([]interface{})[0]) assert.Equal(t, 1.618, segment.Links[0].Attributes["myKey8"].([]interface{})[1]) - jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil) + jsonStr, _ := MakeSegmentDocumentString(span, resource, nil, false, nil, false) assert.True(t, strings.Contains(jsonStr, "links")) diff --git a/exporter/awsxrayexporter/internal/translator/writer_pool_test.go b/exporter/awsxrayexporter/internal/translator/writer_pool_test.go index 4dd6a89a2fa9..b3f34641202d 100644 --- a/exporter/awsxrayexporter/internal/translator/writer_pool_test.go +++ b/exporter/awsxrayexporter/internal/translator/writer_pool_test.go @@ -27,7 +27,7 @@ func TestWriterPoolBasic(t *testing.T) { assert.Equal(t, size, w.buffer.Cap()) assert.Equal(t, 0, w.buffer.Len()) resource := pcommon.NewResource() - segment, _ := MakeSegment(span, resource, nil, false, nil) + segment, _ := MakeSegment(span, resource, nil, false, nil, false) require.NoError(t, w.Encode(*segment)) jsonStr := w.String() assert.Equal(t, len(jsonStr), w.buffer.Len()) @@ -42,7 +42,7 @@ func BenchmarkWithoutPool(b *testing.B) { b.StartTimer() buffer := bytes.NewBuffer(make([]byte, 0, 2048)) encoder := json.NewEncoder(buffer) - segment, _ := MakeSegment(span, pcommon.NewResource(), nil, false, nil) + segment, _ := MakeSegment(span, pcommon.NewResource(), nil, false, nil, false) err := encoder.Encode(*segment) assert.NoError(b, err) logger.Info(buffer.String()) @@ -57,7 +57,7 @@ func BenchmarkWithPool(b *testing.B) { span := constructWriterPoolSpan() b.StartTimer() w := wp.borrow() - segment, _ := MakeSegment(span, pcommon.NewResource(), nil, false, nil) + segment, _ := MakeSegment(span, pcommon.NewResource(), nil, false, nil, false) err := w.Encode(*segment) assert.Nil(b, err) logger.Info(w.String()) diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index b1ebdd7e8b0e..9f35533030f9 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/Azure/azure-kusto-go v0.13.1 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index bfd4514aeb11..d0be99d83464 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -149,8 +149,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/exporter/azuremonitorexporter/log_to_envelope.go b/exporter/azuremonitorexporter/log_to_envelope.go index 83af111ccb14..693fb8037cc7 100644 --- a/exporter/azuremonitorexporter/log_to_envelope.go +++ b/exporter/azuremonitorexporter/log_to_envelope.go @@ -30,7 +30,7 @@ func (packer *logPacker) LogRecordToEnvelope(logRecord plog.LogRecord, resource messageData.SeverityLevel = packer.toAiSeverityLevel(logRecord.SeverityNumber()) - messageData.Message = logRecord.Body().Str() + messageData.Message = logRecord.Body().AsString() envelope.Tags[contracts.OperationId] = traceutil.TraceIDToHexOrEmptyString(logRecord.TraceID()) envelope.Tags[contracts.OperationParentId] = traceutil.SpanIDToHexOrEmptyString(logRecord.SpanID()) diff --git a/exporter/azuremonitorexporter/logexporter_test.go b/exporter/azuremonitorexporter/logexporter_test.go index cdea52b7a36c..fbf111631e1d 100644 --- a/exporter/azuremonitorexporter/logexporter_test.go +++ b/exporter/azuremonitorexporter/logexporter_test.go @@ -15,11 +15,10 @@ import ( "github.com/microsoft/ApplicationInsights-Go/appinsights/contracts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" - - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" ) const ( @@ -28,7 +27,9 @@ const ( ) var ( - testLogs = []byte(`{"resourceLogs":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"dotnet"}}]},"scopeLogs":[{"scope":{},"logRecords":[{"timeUnixNano":"1643240673066096200","severityText":"Information","body":{"stringValue":"Message Body"},"flags":1,"traceId":"7b20d1349ef9b6d6f9d4d1d4a3ac2e82","spanId":"0c2ad924e1771630"},{"timeUnixNano":"0","observedTimeUnixNano":"1643240673066096200","severityText":"Information","body":{"stringValue":"Message Body"},"flags":1,"traceId":"7b20d1349ef9b6d6f9d4d1d4a3ac2e82","spanId":"0c2ad924e1771630"},{"timeUnixNano":"0","observedTimeUnixNano":"0","severityText":"Information","body":{"stringValue":"Message Body"},"flags":1,"traceId":"7b20d1349ef9b6d6f9d4d1d4a3ac2e82","spanId":"0c2ad924e1771630"}]}]}]}`) + testLogTime = time.Date(2020, 2, 11, 20, 26, 13, 789, time.UTC) + testLogTimestamp = pcommon.NewTimestampFromTime(testLogTime) + testStringBody = "Message Body" severityLevelMap = map[plog.SeverityNumber]contracts.SeverityLevel{ plog.SeverityNumberTrace: contracts.Verbose, plog.SeverityNumberDebug4: contracts.Verbose, @@ -52,28 +53,32 @@ func TestLogRecordToEnvelope(t *testing.T) { } tests := []struct { - name string - logRecord plog.LogRecord + name string + index int }{ { - name: "timestamp is correct", - logRecord: getTestLogRecord(t, 0), + name: "timestamp is correct", + index: 0, + }, + { + name: "timestamp is empty", + index: 1, }, { - name: "timestamp is empty", - logRecord: getTestLogRecord(t, 1), + name: "timestamp is empty and observed timestamp is empty", + index: 2, }, { - name: "timestamp is empty and observed timestamp is empty", - logRecord: getTestLogRecord(t, 2), + name: "non-string body", + index: 3, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - logRecord := tt.logRecord + resource, scope, logRecord := getTestLogRecord(tt.index) logPacker := getLogPacker() - envelope := logPacker.LogRecordToEnvelope(logRecord, getResource(), getScope()) + envelope := logPacker.LogRecordToEnvelope(logRecord, resource, scope) require.NotNil(t, envelope) assert.Equal(t, defaultEnvelopeName, envelope.Name) @@ -85,14 +90,10 @@ func TestLogRecordToEnvelope(t *testing.T) { require.NotNil(t, envelopeData.BaseData) messageData := envelopeData.BaseData.(*contracts.MessageData) - assert.Equal(t, messageData.Message, logRecord.Body().Str()) - assert.Equal(t, messageData.SeverityLevel, contracts.Information) - - hexTraceID := traceutil.TraceIDToHexOrEmptyString(logRecord.TraceID()) - assert.Equal(t, envelope.Tags[contracts.OperationId], hexTraceID) - - hexSpanID := traceutil.SpanIDToHexOrEmptyString(logRecord.SpanID()) - assert.Equal(t, envelope.Tags[contracts.OperationParentId], hexSpanID) + assert.Equal(t, logRecord.Body().AsString(), messageData.Message) + assert.Equal(t, contracts.Information, messageData.SeverityLevel) + assert.Equal(t, defaultTraceIDAsHex, envelope.Tags[contracts.OperationId]) + assert.Equal(t, defaultSpanIDAsHex, envelope.Tags[contracts.OperationParentId]) }) } } @@ -102,7 +103,7 @@ func TestToAiSeverityLevel(t *testing.T) { logPacker := getLogPacker() for sn, expectedSeverityLevel := range severityLevelMap { severityLevel := logPacker.toAiSeverityLevel(sn) - assert.Equal(t, severityLevel, expectedSeverityLevel) + assert.Equal(t, expectedSeverityLevel, severityLevel) } } @@ -111,22 +112,22 @@ func TestExporterLogDataCallback(t *testing.T) { mockTransportChannel := getMockTransportChannel() exporter := getLogsExporter(defaultConfig, mockTransportChannel) - logs := getTestLogs(t) + logs := getTestLogs() assert.NoError(t, exporter.onLogData(context.Background(), logs)) - mockTransportChannel.AssertNumberOfCalls(t, "Send", 3) + mockTransportChannel.AssertNumberOfCalls(t, "Send", 4) } func TestLogDataAttributesMapping(t *testing.T) { logPacker := getLogPacker() - logRecord := getTestLogRecord(t, 2) + resource, scope, logRecord := getTestLogRecord(2) logRecord.Attributes().PutInt("attribute_1", 10) logRecord.Attributes().PutStr("attribute_2", "value_2") logRecord.Attributes().PutBool("attribute_3", true) logRecord.Attributes().PutDouble("attribute_4", 1.2) - envelope := logPacker.LogRecordToEnvelope(logRecord, getResource(), getScope()) + envelope := logPacker.LogRecordToEnvelope(logRecord, resource, scope) actualProperties := envelope.Data.(*contracts.Data).BaseData.(*contracts.MessageData).Properties assert.Contains(t, actualProperties["attribute_1"], "10") @@ -136,11 +137,10 @@ func TestLogDataAttributesMapping(t *testing.T) { } func TestLogRecordToEnvelopeResourceAttributes(t *testing.T) { - logRecord := getTestLogRecord(t, 1) + resource, scope, logRecord := getTestLogRecord(1) logPacker := getLogPacker() - resource := getResource() - envelope := logPacker.LogRecordToEnvelope(logRecord, resource, getScope()) + envelope := logPacker.LogRecordToEnvelope(logRecord, resource, scope) require.NotEmpty(t, resource.Attributes()) envelopeData := envelope.Data.(*contracts.Data).BaseData.(*contracts.MessageData) @@ -151,11 +151,10 @@ func TestLogRecordToEnvelopeInstrumentationScope(t *testing.T) { const aiInstrumentationLibraryNameConvention = "instrumentationlibrary.name" const aiInstrumentationLibraryVersionConvention = "instrumentationlibrary.version" - logRecord := getTestLogRecord(t, 1) + resource, scope, logRecord := getTestLogRecord(1) logPacker := getLogPacker() - scope := getScope() - envelope := logPacker.LogRecordToEnvelope(logRecord, getResource(), scope) + envelope := logPacker.LogRecordToEnvelope(logRecord, resource, scope) envelopeData := envelope.Data.(*contracts.Data).BaseData.(*contracts.MessageData) require.Equal(t, scope.Name(), envelopeData.Properties[aiInstrumentationLibraryNameConvention]) @@ -166,11 +165,10 @@ func TestLogRecordToEnvelopeCloudTags(t *testing.T) { const aiCloudRoleConvention = "ai.cloud.role" const aiCloudRoleInstanceConvention = "ai.cloud.roleInstance" - logRecord := getTestLogRecord(t, 1) + resource, scope, logRecord := getTestLogRecord(1) logPacker := getLogPacker() - resource := getResource() - envelope := logPacker.LogRecordToEnvelope(logRecord, resource, getScope()) + envelope := logPacker.LogRecordToEnvelope(logRecord, resource, scope) resourceAttributes := resource.Attributes().AsRaw() expectedCloudRole := resourceAttributes[conventions.AttributeServiceNamespace].(string) + "." + resourceAttributes[conventions.AttributeServiceName].(string) @@ -191,20 +189,72 @@ func getLogPacker() *logPacker { return newLogPacker(zap.NewNop()) } -func getTestLogs(tb testing.TB) plog.Logs { - logsMarshaler := &plog.JSONUnmarshaler{} - logs, err := logsMarshaler.UnmarshalLogs(testLogs) - assert.NoError(tb, err, "Can't unmarshal testing logs data -> %s", err) +func getTestLogs() plog.Logs { + logs := plog.NewLogs() + + // add the resource + resourceLogs := logs.ResourceLogs().AppendEmpty() + resource := resourceLogs.Resource() + resource.Attributes().PutStr(conventions.AttributeServiceName, defaultServiceName) + resource.Attributes().PutStr(conventions.AttributeServiceNamespace, defaultServiceNamespace) + resource.Attributes().PutStr(conventions.AttributeServiceInstanceID, defaultServiceInstance) + + // add the scope + scopeLogs := resourceLogs.ScopeLogs().AppendEmpty() + scope := scopeLogs.Scope() + scope.SetName(defaultScopeName) + scope.SetVersion(defaultScopeVersion) + + // add the log records + log := scopeLogs.LogRecords().AppendEmpty() + log.SetTimestamp(testLogTimestamp) + log.SetSeverityNumber(plog.SeverityNumberInfo) + log.SetSeverityText("Information") + log.SetFlags(1) + log.SetSpanID(defaultSpanID) + log.SetTraceID(defaultTraceID) + log.Body().SetStr(testStringBody) + + log = scopeLogs.LogRecords().AppendEmpty() + log.SetObservedTimestamp(testLogTimestamp) + log.SetSeverityNumber(plog.SeverityNumberInfo) + log.SetSeverityText("Information") + log.SetFlags(1) + log.SetSpanID(defaultSpanID) + log.SetTraceID(defaultTraceID) + log.Body().SetStr(testStringBody) + + log = scopeLogs.LogRecords().AppendEmpty() + log.SetSeverityNumber(plog.SeverityNumberInfo) + log.SetSeverityText("Information") + log.SetFlags(1) + log.SetSpanID(defaultSpanID) + log.SetTraceID(defaultTraceID) + log.Body().SetStr(testStringBody) + + log = scopeLogs.LogRecords().AppendEmpty() + log.SetTimestamp(testLogTimestamp) + log.SetSeverityNumber(plog.SeverityNumberInfo) + log.SetSeverityText("Information") + log.SetFlags(1) + log.SetSpanID(defaultSpanID) + log.SetTraceID(defaultTraceID) + + bodyMap := log.Body().SetEmptyMap() + bodyMap.PutStr("key1", "value1") + bodyMap.PutBool("key2", true) + return logs } -func getTestLogRecord(tb testing.TB, index int) plog.LogRecord { - var logRecord plog.LogRecord - logs := getTestLogs(tb) +func getTestLogRecord(index int) (pcommon.Resource, pcommon.InstrumentationScope, plog.LogRecord) { + logs := getTestLogs() resourceLogs := logs.ResourceLogs() + resource := resourceLogs.At(0).Resource() scopeLogs := resourceLogs.At(0).ScopeLogs() + scope := scopeLogs.At(0).Scope() logRecords := scopeLogs.At(0).LogRecords() - logRecord = logRecords.At(index) + logRecord := logRecords.At(index) - return logRecord + return resource, scope, logRecord } diff --git a/exporter/azuremonitorexporter/metric_to_envelopes.go b/exporter/azuremonitorexporter/metric_to_envelopes.go index a0bc247f8076..fd454113d936 100644 --- a/exporter/azuremonitorexporter/metric_to_envelopes.go +++ b/exporter/azuremonitorexporter/metric_to_envelopes.go @@ -87,6 +87,7 @@ func newMetricPacker(logger *zap.Logger) *metricPacker { } func (packer metricPacker) getMetricTimedData(metric pmetric.Metric) metricTimedData { + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: return newScalarMetric(metric.Name(), metric.Gauge().DataPoints()) diff --git a/exporter/cassandraexporter/README.md b/exporter/cassandraexporter/README.md index a640f2a4e84b..1efd9cd72805 100644 --- a/exporter/cassandraexporter/README.md +++ b/exporter/cassandraexporter/README.md @@ -18,6 +18,7 @@ The following settings can be optionally configured: - `dsn` The Cassandra server DSN (Data Source Name), for example `127.0.0.1`. reference: [https://pkg.go.dev/github.com/gocql/gocql](https://pkg.go.dev/github.com/gocql/gocql) +- `port` (default = 9042) The Cassandra server Port - `keyspace` (default = otel): The keyspace name. - `trace_table` (default = otel_spans): The table name for traces. - `replication` (default = class: SimpleStrategy, replication_factor: 1) The strategy of @@ -30,6 +31,7 @@ The following settings can be optionally configured: exporters: cassandra: dsn: 127.0.0.1 + port: 9042 keyspace: "otel" trace_table: "otel_spans" replication: diff --git a/exporter/cassandraexporter/config.go b/exporter/cassandraexporter/config.go index b762ceb4ad65..b9b6bd769437 100644 --- a/exporter/cassandraexporter/config.go +++ b/exporter/cassandraexporter/config.go @@ -5,6 +5,7 @@ package cassandraexporter // import "github.com/open-telemetry/opentelemetry-col type Config struct { DSN string `mapstructure:"dsn"` + Port int `mapstructure:"port"` Keyspace string `mapstructure:"keyspace"` TraceTable string `mapstructure:"trace_table"` LogsTable string `mapstructure:"logs_table"` diff --git a/exporter/cassandraexporter/config_test.go b/exporter/cassandraexporter/config_test.go index a05878f98dd4..3459addb7548 100644 --- a/exporter/cassandraexporter/config_test.go +++ b/exporter/cassandraexporter/config_test.go @@ -16,6 +16,7 @@ import ( ) const defaultDSN = "127.0.0.1" +const defaultPort = 9042 func TestLoadConfig(t *testing.T) { t.Parallel() @@ -25,6 +26,7 @@ func TestLoadConfig(t *testing.T) { defaultCfg := createDefaultConfig() defaultCfg.(*Config).DSN = defaultDSN + defaultCfg.(*Config).Port = defaultPort tests := []struct { id component.ID diff --git a/exporter/cassandraexporter/exporter_logs.go b/exporter/cassandraexporter/exporter_logs.go index 4344c3923e5d..8b824829358a 100644 --- a/exporter/cassandraexporter/exporter_logs.go +++ b/exporter/cassandraexporter/exporter_logs.go @@ -28,6 +28,7 @@ func newLogsExporter(logger *zap.Logger, cfg *Config) (*logsExporter, error) { session, err := cluster.CreateSession() cluster.Keyspace = cfg.Keyspace cluster.Consistency = gocql.Quorum + cluster.Port = cfg.Port if err != nil { return nil, err @@ -40,6 +41,8 @@ func initializeLogKernel(cfg *Config) error { ctx := context.Background() cluster := gocql.NewCluster(cfg.DSN) cluster.Consistency = gocql.Quorum + cluster.Port = cfg.Port + session, err := cluster.CreateSession() if err != nil { return err @@ -89,7 +92,10 @@ func (e *logsExporter) pushLogsData(ctx context.Context, ld plog.Logs) error { for k := 0; k < rs.Len(); k++ { r := rs.At(k) logAttr := attributesToMap(r.Attributes().AsRaw()) - bodyByte, _ := json.Marshal(r.Body().AsRaw()) + bodyByte, err := json.Marshal(r.Body().AsRaw()) + if err != nil { + return err + } insertLogError := e.client.Query(fmt.Sprintf(insertLogTableSQL, e.cfg.Keyspace, e.cfg.LogsTable), r.Timestamp().AsTime(), diff --git a/exporter/cassandraexporter/exporter_traces.go b/exporter/cassandraexporter/exporter_traces.go index 2ebadaab9eed..f8f72e342d92 100644 --- a/exporter/cassandraexporter/exporter_traces.go +++ b/exporter/cassandraexporter/exporter_traces.go @@ -27,6 +27,7 @@ func newTracesExporter(logger *zap.Logger, cfg *Config) (*tracesExporter, error) session, err := cluster.CreateSession() cluster.Keyspace = cfg.Keyspace cluster.Consistency = gocql.Quorum + cluster.Port = cfg.Port if err != nil { return nil, err @@ -39,6 +40,8 @@ func initializeTraceKernel(cfg *Config) error { ctx := context.Background() cluster := gocql.NewCluster(cfg.DSN) cluster.Consistency = gocql.Quorum + cluster.Port = cfg.Port + session, err := cluster.CreateSession() if err != nil { return err diff --git a/exporter/cassandraexporter/factory.go b/exporter/cassandraexporter/factory.go index 2bc523c8cb0b..6b81592338be 100644 --- a/exporter/cassandraexporter/factory.go +++ b/exporter/cassandraexporter/factory.go @@ -25,6 +25,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ DSN: "127.0.0.1", + Port: 9042, Keyspace: "otel", TraceTable: "otel_spans", LogsTable: "otel_logs", @@ -40,22 +41,22 @@ func createDefaultConfig() component.Config { func createTracesExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { c := cfg.(*Config) - exporter, err := newTracesExporter(set.Logger, c) + exp, err := newTracesExporter(set.Logger, c) if err != nil { return nil, fmt.Errorf("cannot configure cassandra traces exporter: %w", err) } - return exporterhelper.NewTracesExporter(ctx, set, cfg, exporter.pushTraceData, exporterhelper.WithShutdown(exporter.Shutdown), exporterhelper.WithStart(exporter.Start)) + return exporterhelper.NewTracesExporter(ctx, set, cfg, exp.pushTraceData, exporterhelper.WithShutdown(exp.Shutdown), exporterhelper.WithStart(exp.Start)) } func createLogsExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { c := cfg.(*Config) - exporter, err := newLogsExporter(set.Logger, c) + exp, err := newLogsExporter(set.Logger, c) if err != nil { return nil, fmt.Errorf("cannot configure cassandra traces exporter: %w", err) } - return exporterhelper.NewLogsExporter(ctx, set, cfg, exporter.pushLogsData, exporterhelper.WithShutdown(exporter.Shutdown), exporterhelper.WithStart(exporter.Start)) + return exporterhelper.NewLogsExporter(ctx, set, cfg, exp.pushLogsData, exporterhelper.WithShutdown(exp.Shutdown), exporterhelper.WithStart(exp.Start)) } diff --git a/exporter/clickhouseexporter/exporter_metrics_test.go b/exporter/clickhouseexporter/exporter_metrics_test.go index 39540479194e..4058a80bc8ac 100644 --- a/exporter/clickhouseexporter/exporter_metrics_test.go +++ b/exporter/clickhouseexporter/exporter_metrics_test.go @@ -31,7 +31,7 @@ func TestExporter_pushMetricsData(t *testing.T) { exporter := newTestMetricsExporter(t) mustPushMetricsData(t, exporter, simpleMetrics(1)) - require.Equal(t, int32(5), items.Load()) + require.Equal(t, int32(15), items.Load()) }) t.Run("push failure", func(t *testing.T) { initClickhouseTestServer(t, func(query string, values []driver.Value) error { @@ -44,45 +44,50 @@ func TestExporter_pushMetricsData(t *testing.T) { err := exporter.pushMetricsData(context.TODO(), simpleMetrics(2)) require.Error(t, err) }) - t.Run("check Resource metadata and scope metadata", func(t *testing.T) { + t.Run("check Resource metadata and scope metadata (2nd resource contain 2 different scope metrics)", func(t *testing.T) { items := &atomic.Int32{} + resourceSchemaIdx := []int{1, 2, 2} + scopeNameIdx := []int{1, 2, 3} + + itemIdxs := map[string]*atomic.Uint32{ + "otel_metrics_exponential_histogram": {}, + "otel_metrics_gauge": {}, + "otel_metrics_histogram": {}, + "otel_metrics_sum": {}, + "otel_metrics_summary": {}, + } initClickhouseTestServer(t, func(query string, values []driver.Value) error { if strings.HasPrefix(query, "INSERT") { items.Add(1) if strings.HasPrefix(query, "INSERT INTO otel_metrics_exponential_histogram") { - require.Equal(t, "Resource SchemaUrl 1", values[1]) - require.Equal(t, "Scope name 1", values[2]) - - require.Equal(t, "Resource SchemaUrl 2", values[30]) - require.Equal(t, "Scope name 2", values[31]) + idx := itemIdxs["otel_metrics_exponential_histogram"] + require.Equal(t, fmt.Sprintf("Resource SchemaUrl %d", resourceSchemaIdx[idx.Load()]), values[1]) + require.Equal(t, fmt.Sprintf("Scope name %d", scopeNameIdx[idx.Load()]), values[2]) + idx.Add(1) } if strings.HasPrefix(query, "INSERT INTO otel_metrics_gauge") { - require.Equal(t, "Resource SchemaUrl 1", values[1]) - require.Equal(t, "Scope name 1", values[2]) - - require.Equal(t, "Resource SchemaUrl 2", values[21]) - require.Equal(t, "Scope name 2", values[22]) + idx := itemIdxs["otel_metrics_gauge"] + require.Equal(t, fmt.Sprintf("Resource SchemaUrl %d", resourceSchemaIdx[idx.Load()]), values[1]) + require.Equal(t, fmt.Sprintf("Scope name %d", scopeNameIdx[idx.Load()]), values[2]) + idx.Add(1) } if strings.HasPrefix(query, "INSERT INTO otel_metrics_histogram") { - require.Equal(t, "Resource SchemaUrl 1", values[1]) - require.Equal(t, "Scope name 1", values[2]) - - require.Equal(t, "Resource SchemaUrl 2", values[26]) - require.Equal(t, "Scope name 2", values[27]) + idx := itemIdxs["otel_metrics_histogram"] + require.Equal(t, fmt.Sprintf("Resource SchemaUrl %d", resourceSchemaIdx[idx.Load()]), values[1]) + require.Equal(t, fmt.Sprintf("Scope name %d", scopeNameIdx[idx.Load()]), values[2]) + idx.Add(1) } if strings.HasPrefix(query, "INSERT INTO otel_metrics_sum (") { - require.Equal(t, "Resource SchemaUrl 1", values[1]) - require.Equal(t, "Scope name 1", values[2]) - - require.Equal(t, "Resource SchemaUrl 2", values[23]) - require.Equal(t, "Scope name 2", values[24]) + idx := itemIdxs["otel_metrics_sum"] + require.Equal(t, fmt.Sprintf("Resource SchemaUrl %d", resourceSchemaIdx[idx.Load()]), values[1]) + require.Equal(t, fmt.Sprintf("Scope name %d", scopeNameIdx[idx.Load()]), values[2]) + idx.Add(1) } if strings.HasPrefix(query, "INSERT INTO otel_metrics_summary") { - require.Equal(t, "Resource SchemaUrl 1", values[1]) - require.Equal(t, "Scope name 1", values[2]) - - require.Equal(t, "Resource SchemaUrl 2", values[19]) - require.Equal(t, "Scope name 2", values[20]) + idx := itemIdxs["otel_metrics_summary"] + require.Equal(t, fmt.Sprintf("Resource SchemaUrl %d", resourceSchemaIdx[idx.Load()]), values[1]) + require.Equal(t, fmt.Sprintf("Scope name %d", scopeNameIdx[idx.Load()]), values[2]) + idx.Add(1) } } return nil @@ -90,49 +95,7 @@ func TestExporter_pushMetricsData(t *testing.T) { exporter := newTestMetricsExporter(t) mustPushMetricsData(t, exporter, simpleMetrics(1)) - require.Equal(t, int32(5), items.Load()) - }) - t.Run("check one resource metrics contain different scope metrics", func(t *testing.T) { - initClickhouseTestServer(t, func(query string, values []driver.Value) error { - if strings.HasPrefix(query, "INSERT INTO otel_metrics_exponential_histogram") { - require.Equal(t, "Resource SchemaUrl 2", values[30]) - require.Equal(t, "Scope name 2", values[31]) - - require.Equal(t, "Resource SchemaUrl 2", values[59]) - require.Equal(t, "Scope name 3", values[60]) - } - if strings.HasPrefix(query, "INSERT INTO otel_metrics_gauge") { - require.Equal(t, "Resource SchemaUrl 2", values[21]) - require.Equal(t, "Scope name 2", values[22]) - - require.Equal(t, "Resource SchemaUrl 2", values[41]) - require.Equal(t, "Scope name 3", values[42]) - } - if strings.HasPrefix(query, "INSERT INTO otel_metrics_histogram") { - require.Equal(t, "Resource SchemaUrl 2", values[26]) - require.Equal(t, "Scope name 2", values[27]) - - require.Equal(t, "Resource SchemaUrl 2", values[51]) - require.Equal(t, "Scope name 3", values[52]) - } - if strings.HasPrefix(query, "INSERT INTO otel_metrics_sum (") { - require.Equal(t, "Resource SchemaUrl 2", values[23]) - require.Equal(t, "Scope name 2", values[24]) - - require.Equal(t, "Resource SchemaUrl 2", values[45]) - require.Equal(t, "Scope name 3", values[46]) - } - if strings.HasPrefix(query, "INSERT INTO otel_metrics_summary") { - require.Equal(t, "Resource SchemaUrl 2", values[19]) - require.Equal(t, "Scope name 2", values[20]) - - require.Equal(t, "Resource SchemaUrl 2", values[37]) - require.Equal(t, "Scope name 3", values[38]) - } - return nil - }) - exporter := newTestMetricsExporter(t) - mustPushMetricsData(t, exporter, simpleMetrics(1)) + require.Equal(t, int32(15), items.Load()) }) } diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index c6b9f2c0b0a2..011a882b6776 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.20 require ( - github.com/ClickHouse/clickhouse-go/v2 v2.13.0 + github.com/ClickHouse/clickhouse-go/v2 v2.13.2 github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/stretchr/testify v1.8.4 @@ -17,7 +17,7 @@ require ( ) require ( - github.com/ClickHouse/ch-go v0.52.1 // indirect + github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -25,7 +25,7 @@ require ( github.com/go-faster/errors v0.6.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect @@ -36,7 +36,7 @@ require ( 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.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/asm v1.2.0 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 588596258074..3e02014c5c1d 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -2,10 +2,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/ClickHouse/ch-go v0.52.1 h1:nucdgfD1BDSHjbNaG3VNebonxJzD8fX8jbuBpfo5VY0= -github.com/ClickHouse/ch-go v0.52.1/go.mod h1:B9htMJ0hii/zrC2hljUKdnagRBuLqtRG/GrU3jqCwRk= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbOtM+e/3qdexG9k= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0= +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.13.2 h1:LSg6670+xbd5VczO5Ei3DHZBIeGulfwhNuHCUth/qOA= +github.com/ClickHouse/clickhouse-go/v2 v2.13.2/go.mod h1:4QITCrdY/ugPYA+QGnJ92h+v7TGaZQ7l0393Q/wlM3Q= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -116,8 +116,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -231,8 +231,8 @@ github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/En github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -341,7 +341,7 @@ go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh4 go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/exporter/clickhouseexporter/internal/exponential_histogram_metrics.go b/exporter/clickhouseexporter/internal/exponential_histogram_metrics.go index f6445692ffbd..421d967cd61c 100644 --- a/exporter/clickhouseexporter/internal/exponential_histogram_metrics.go +++ b/exporter/clickhouseexporter/internal/exponential_histogram_metrics.go @@ -7,7 +7,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "go.opentelemetry.io/collector/pdata/pcommon" @@ -32,7 +31,7 @@ CREATE TABLE IF NOT EXISTS %s_exponential_histogram ( Attributes Map(LowCardinality(String), String) CODEC(ZSTD(1)), StartTimeUnix DateTime64(9) CODEC(Delta, ZSTD(1)), TimeUnix DateTime64(9) CODEC(Delta, ZSTD(1)), - Count Int64 CODEC(Delta, ZSTD(1)), + Count UInt64 CODEC(Delta, ZSTD(1)), Sum Float64 CODEC(ZSTD(1)), Scale Int32 CODEC(ZSTD(1)), ZeroCount UInt64 CODEC(ZSTD(1)), @@ -92,12 +91,9 @@ SETTINGS index_granularity=8192, ttl_only_drop_parts = 1; Exemplars.TraceId, Flags, Min, - Max) VALUES ` - expHistogramValueCounts = 29 + Max) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)` ) -var expHistogramPlaceholders = newPlaceholder(expHistogramValueCounts) - type expHistogramModel struct { metricName string metricDescription string @@ -117,54 +113,58 @@ func (e *expHistogramMetrics) insert(ctx context.Context, db *sql.DB) error { return nil } - valueArgs := make([]any, e.count*expHistogramValueCounts) - var b strings.Builder - - index := 0 - for _, model := range e.expHistogramModels { - for i := 0; i < model.expHistogram.DataPoints().Len(); i++ { - dp := model.expHistogram.DataPoints().At(i) - b.WriteString(*expHistogramPlaceholders) - - valueArgs[index] = model.metadata.ResAttr - valueArgs[index+1] = model.metadata.ResURL - valueArgs[index+2] = model.metadata.ScopeInstr.Name() - valueArgs[index+3] = model.metadata.ScopeInstr.Version() - valueArgs[index+4] = attributesToMap(model.metadata.ScopeInstr.Attributes()) - valueArgs[index+5] = model.metadata.ScopeInstr.DroppedAttributesCount() - valueArgs[index+6] = model.metadata.ScopeURL - valueArgs[index+7] = model.metricName - valueArgs[index+8] = model.metricDescription - valueArgs[index+9] = model.metricUnit - valueArgs[index+10] = attributesToMap(dp.Attributes()) - valueArgs[index+11] = dp.StartTimestamp().AsTime().UnixNano() - valueArgs[index+12] = dp.Timestamp().AsTime().UnixNano() - valueArgs[index+13] = dp.Count() - valueArgs[index+14] = dp.Sum() - valueArgs[index+15] = dp.Scale() - valueArgs[index+16] = dp.ZeroCount() - valueArgs[index+17] = dp.Positive().Offset() - valueArgs[index+18] = convertSliceToArraySet(dp.Positive().BucketCounts().AsRaw()) - valueArgs[index+19] = dp.Negative().Offset() - valueArgs[index+20] = convertSliceToArraySet(dp.Negative().BucketCounts().AsRaw()) - - attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) - valueArgs[index+21] = attrs - valueArgs[index+22] = times - valueArgs[index+23] = values - valueArgs[index+24] = traceIDs - valueArgs[index+25] = spanIDs - valueArgs[index+26] = uint32(dp.Flags()) - valueArgs[index+27] = dp.Min() - valueArgs[index+28] = dp.Max() - - index += expHistogramValueCounts - } - } - start := time.Now() err := doWithTx(ctx, db, func(tx *sql.Tx) error { - _, err := tx.ExecContext(ctx, fmt.Sprintf("%s %s", e.insertSQL, strings.TrimSuffix(b.String(), ",")), valueArgs...) + statement, err := tx.PrepareContext(ctx, e.insertSQL) + if err != nil { + return err + } + + defer func() { + _ = statement.Close() + }() + + for _, model := range e.expHistogramModels { + for i := 0; i < model.expHistogram.DataPoints().Len(); i++ { + dp := model.expHistogram.DataPoints().At(i) + + attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) + _, err = statement.ExecContext(ctx, + model.metadata.ResAttr, + model.metadata.ResURL, + model.metadata.ScopeInstr.Name(), + model.metadata.ScopeInstr.Version(), + attributesToMap(model.metadata.ScopeInstr.Attributes()), + model.metadata.ScopeInstr.DroppedAttributesCount(), + model.metadata.ScopeURL, + model.metricName, + model.metricDescription, + model.metricUnit, + attributesToMap(dp.Attributes()), + dp.StartTimestamp().AsTime(), + dp.Timestamp().AsTime(), + dp.Count(), + dp.Sum(), + dp.Scale(), + dp.ZeroCount(), + dp.Positive().Offset(), + convertSliceToArraySet(dp.Positive().BucketCounts().AsRaw()), + dp.Negative().Offset(), + convertSliceToArraySet(dp.Negative().BucketCounts().AsRaw()), + attrs, + times, + values, + traceIDs, + spanIDs, + uint32(dp.Flags()), + dp.Min(), + dp.Max(), + ) + if err != nil { + return fmt.Errorf("ExecContext:%w", err) + } + } + } return err }) duration := time.Since(start) diff --git a/exporter/clickhouseexporter/internal/gauge_metrics.go b/exporter/clickhouseexporter/internal/gauge_metrics.go index b018a94de3c7..d16caa78f56a 100644 --- a/exporter/clickhouseexporter/internal/gauge_metrics.go +++ b/exporter/clickhouseexporter/internal/gauge_metrics.go @@ -7,7 +7,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "go.opentelemetry.io/collector/pdata/pcommon" @@ -74,12 +73,9 @@ SETTINGS index_granularity=8192, ttl_only_drop_parts = 1; Exemplars.TimeUnix, Exemplars.Value, Exemplars.SpanId, - Exemplars.TraceId) VALUES ` - gaugeValueCounts = 20 + Exemplars.TraceId) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)` ) -var gaugePlaceholders = newPlaceholder(gaugeValueCounts) - type gaugeModel struct { metricName string metricDescription string @@ -98,46 +94,48 @@ func (g *gaugeMetrics) insert(ctx context.Context, db *sql.DB) error { if g.count == 0 { return nil } - - valueArgs := make([]any, g.count*gaugeValueCounts) - var b strings.Builder - - index := 0 - for _, model := range g.gaugeModels { - for i := 0; i < model.gauge.DataPoints().Len(); i++ { - dp := model.gauge.DataPoints().At(i) - b.WriteString(*gaugePlaceholders) - - valueArgs[index] = model.metadata.ResAttr - valueArgs[index+1] = model.metadata.ResURL - valueArgs[index+2] = model.metadata.ScopeInstr.Name() - valueArgs[index+3] = model.metadata.ScopeInstr.Version() - valueArgs[index+4] = attributesToMap(model.metadata.ScopeInstr.Attributes()) - valueArgs[index+5] = model.metadata.ScopeInstr.DroppedAttributesCount() - valueArgs[index+6] = model.metadata.ScopeURL - valueArgs[index+7] = model.metricName - valueArgs[index+8] = model.metricDescription - valueArgs[index+9] = model.metricUnit - valueArgs[index+10] = attributesToMap(dp.Attributes()) - valueArgs[index+11] = dp.StartTimestamp().AsTime().UnixNano() - valueArgs[index+12] = dp.Timestamp().AsTime().UnixNano() - valueArgs[index+13] = getValue(dp.IntValue(), dp.DoubleValue(), dp.ValueType()) - valueArgs[index+14] = uint32(dp.Flags()) - - attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) - valueArgs[index+15] = attrs - valueArgs[index+16] = times - valueArgs[index+17] = values - valueArgs[index+18] = traceIDs - valueArgs[index+19] = spanIDs - - index += gaugeValueCounts - } - } - start := time.Now() err := doWithTx(ctx, db, func(tx *sql.Tx) error { - _, err := tx.ExecContext(ctx, fmt.Sprintf("%s %s", g.insertSQL, strings.TrimSuffix(b.String(), ",")), valueArgs...) + statement, err := tx.PrepareContext(ctx, g.insertSQL) + if err != nil { + return err + } + + defer func() { + _ = statement.Close() + }() + + for _, model := range g.gaugeModels { + for i := 0; i < model.gauge.DataPoints().Len(); i++ { + dp := model.gauge.DataPoints().At(i) + attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) + _, err = statement.ExecContext(ctx, + model.metadata.ResAttr, + model.metadata.ResURL, + model.metadata.ScopeInstr.Name(), + model.metadata.ScopeInstr.Version(), + attributesToMap(model.metadata.ScopeInstr.Attributes()), + model.metadata.ScopeInstr.DroppedAttributesCount(), + model.metadata.ScopeURL, + model.metricName, + model.metricDescription, + model.metricUnit, + attributesToMap(dp.Attributes()), + dp.StartTimestamp().AsTime(), + dp.Timestamp().AsTime(), + getValue(dp.IntValue(), dp.DoubleValue(), dp.ValueType()), + uint32(dp.Flags()), + attrs, + times, + values, + traceIDs, + spanIDs, + ) + if err != nil { + return fmt.Errorf("ExecContext:%w", err) + } + } + } return err }) duration := time.Since(start) @@ -145,10 +143,6 @@ func (g *gaugeMetrics) insert(ctx context.Context, db *sql.DB) error { logger.Debug("insert gauge metrics fail", zap.Duration("cost", duration)) return fmt.Errorf("insert gauge metrics fail:%w", err) } - - // TODO latency metrics - logger.Debug("insert gauge metrics", zap.Int("records", g.count), - zap.Duration("cost", duration)) return nil } diff --git a/exporter/clickhouseexporter/internal/histogram_metrics.go b/exporter/clickhouseexporter/internal/histogram_metrics.go index 6e33c7068f29..0ce19fe4d08b 100644 --- a/exporter/clickhouseexporter/internal/histogram_metrics.go +++ b/exporter/clickhouseexporter/internal/histogram_metrics.go @@ -7,7 +7,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "go.opentelemetry.io/collector/pdata/pcommon" @@ -32,7 +31,7 @@ CREATE TABLE IF NOT EXISTS %s_histogram ( Attributes Map(LowCardinality(String), String) CODEC(ZSTD(1)), StartTimeUnix DateTime64(9) CODEC(Delta, ZSTD(1)), TimeUnix DateTime64(9) CODEC(Delta, ZSTD(1)), - Count Int64 CODEC(Delta, ZSTD(1)), + Count UInt64 CODEC(Delta, ZSTD(1)), Sum Float64 CODEC(ZSTD(1)), BucketCounts Array(UInt64) CODEC(ZSTD(1)), ExplicitBounds Array(Float64) CODEC(ZSTD(1)), @@ -84,12 +83,9 @@ SETTINGS index_granularity=8192, ttl_only_drop_parts = 1; Exemplars.TraceId, Flags, Min, - Max) VALUES ` - histogramValueCounts = 25 + Max) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)` ) -var histogramPlaceholders = newPlaceholder(histogramValueCounts) - type histogramModel struct { metricName string metricDescription string @@ -108,51 +104,53 @@ func (h *histogramMetrics) insert(ctx context.Context, db *sql.DB) error { if h.count == 0 { return nil } - - valueArgs := make([]any, h.count*histogramValueCounts) - var b strings.Builder - - index := 0 - for _, model := range h.histogramModel { - for i := 0; i < model.histogram.DataPoints().Len(); i++ { - dp := model.histogram.DataPoints().At(i) - b.WriteString(*histogramPlaceholders) - - valueArgs[index] = model.metadata.ResAttr - valueArgs[index+1] = model.metadata.ResURL - valueArgs[index+2] = model.metadata.ScopeInstr.Name() - valueArgs[index+3] = model.metadata.ScopeInstr.Version() - valueArgs[index+4] = attributesToMap(model.metadata.ScopeInstr.Attributes()) - valueArgs[index+5] = model.metadata.ScopeInstr.DroppedAttributesCount() - valueArgs[index+6] = model.metadata.ScopeURL - valueArgs[index+7] = model.metricName - valueArgs[index+8] = model.metricDescription - valueArgs[index+9] = model.metricUnit - valueArgs[index+10] = attributesToMap(dp.Attributes()) - valueArgs[index+11] = dp.StartTimestamp().AsTime().UnixNano() - valueArgs[index+12] = dp.Timestamp().AsTime().UnixNano() - valueArgs[index+13] = dp.Count() - valueArgs[index+14] = dp.Sum() - valueArgs[index+15] = convertSliceToArraySet(dp.BucketCounts().AsRaw()) - valueArgs[index+16] = convertSliceToArraySet(dp.ExplicitBounds().AsRaw()) - - attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) - valueArgs[index+17] = attrs - valueArgs[index+18] = times - valueArgs[index+19] = values - valueArgs[index+20] = traceIDs - valueArgs[index+21] = spanIDs - valueArgs[index+22] = uint32(dp.Flags()) - valueArgs[index+23] = dp.Min() - valueArgs[index+24] = dp.Max() - - index += histogramValueCounts - } - } - start := time.Now() err := doWithTx(ctx, db, func(tx *sql.Tx) error { - _, err := tx.ExecContext(ctx, fmt.Sprintf("%s %s", h.insertSQL, strings.TrimSuffix(b.String(), ",")), valueArgs...) + statement, err := tx.PrepareContext(ctx, h.insertSQL) + if err != nil { + return err + } + + defer func() { + _ = statement.Close() + }() + + for _, model := range h.histogramModel { + for i := 0; i < model.histogram.DataPoints().Len(); i++ { + dp := model.histogram.DataPoints().At(i) + attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) + _, err = statement.ExecContext(ctx, + model.metadata.ResAttr, + model.metadata.ResURL, + model.metadata.ScopeInstr.Name(), + model.metadata.ScopeInstr.Version(), + attributesToMap(model.metadata.ScopeInstr.Attributes()), + model.metadata.ScopeInstr.DroppedAttributesCount(), + model.metadata.ScopeURL, + model.metricName, + model.metricDescription, + model.metricUnit, + attributesToMap(dp.Attributes()), + dp.StartTimestamp().AsTime(), + dp.Timestamp().AsTime(), + dp.Count(), + dp.Sum(), + convertSliceToArraySet(dp.BucketCounts().AsRaw()), + convertSliceToArraySet(dp.ExplicitBounds().AsRaw()), + attrs, + times, + values, + traceIDs, + spanIDs, + uint32(dp.Flags()), + dp.Min(), + dp.Max(), + ) + if err != nil { + return fmt.Errorf("ExecContext:%w", err) + } + } + } return err }) duration := time.Since(start) diff --git a/exporter/clickhouseexporter/internal/sum_metrics.go b/exporter/clickhouseexporter/internal/sum_metrics.go index f21bdae5bdc3..69f9a9d1d5d5 100644 --- a/exporter/clickhouseexporter/internal/sum_metrics.go +++ b/exporter/clickhouseexporter/internal/sum_metrics.go @@ -7,7 +7,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "go.opentelemetry.io/collector/pdata/pcommon" @@ -78,12 +77,9 @@ SETTINGS index_granularity=8192, ttl_only_drop_parts = 1; Exemplars.SpanId, Exemplars.TraceId, AggTemp, - IsMonotonic) VALUES ` - sumValueCounts = 22 + IsMonotonic) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)` ) -var sumPlaceholders = newPlaceholder(sumValueCounts) - type sumModel struct { metricName string metricDescription string @@ -102,48 +98,50 @@ func (s *sumMetrics) insert(ctx context.Context, db *sql.DB) error { if s.count == 0 { return nil } - - valueArgs := make([]any, s.count*sumValueCounts) - var b strings.Builder - - index := 0 - for _, model := range s.sumModel { - for i := 0; i < model.sum.DataPoints().Len(); i++ { - dp := model.sum.DataPoints().At(i) - b.WriteString(*sumPlaceholders) - - valueArgs[index] = model.metadata.ResAttr - valueArgs[index+1] = model.metadata.ResURL - valueArgs[index+2] = model.metadata.ScopeInstr.Name() - valueArgs[index+3] = model.metadata.ScopeInstr.Version() - valueArgs[index+4] = attributesToMap(model.metadata.ScopeInstr.Attributes()) - valueArgs[index+5] = model.metadata.ScopeInstr.DroppedAttributesCount() - valueArgs[index+6] = model.metadata.ScopeURL - valueArgs[index+7] = model.metricName - valueArgs[index+8] = model.metricDescription - valueArgs[index+9] = model.metricUnit - valueArgs[index+10] = attributesToMap(dp.Attributes()) - valueArgs[index+11] = dp.StartTimestamp().AsTime().UnixNano() - valueArgs[index+12] = dp.Timestamp().AsTime().UnixNano() - valueArgs[index+13] = getValue(dp.IntValue(), dp.DoubleValue(), dp.ValueType()) - valueArgs[index+14] = uint32(dp.Flags()) - - attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) - valueArgs[index+15] = attrs - valueArgs[index+16] = times - valueArgs[index+17] = values - valueArgs[index+18] = traceIDs - valueArgs[index+19] = spanIDs - valueArgs[index+20] = int32(model.sum.AggregationTemporality()) - valueArgs[index+21] = model.sum.IsMonotonic() - - index += sumValueCounts - } - } - start := time.Now() err := doWithTx(ctx, db, func(tx *sql.Tx) error { - _, err := tx.ExecContext(ctx, fmt.Sprintf("%s %s", s.insertSQL, strings.TrimSuffix(b.String(), ",")), valueArgs...) + statement, err := tx.PrepareContext(ctx, s.insertSQL) + if err != nil { + return err + } + + defer func() { + _ = statement.Close() + }() + + for _, model := range s.sumModel { + for i := 0; i < model.sum.DataPoints().Len(); i++ { + dp := model.sum.DataPoints().At(i) + attrs, times, values, traceIDs, spanIDs := convertExemplars(dp.Exemplars()) + _, err = statement.ExecContext(ctx, + model.metadata.ResAttr, + model.metadata.ResURL, + model.metadata.ScopeInstr.Name(), + model.metadata.ScopeInstr.Version(), + attributesToMap(model.metadata.ScopeInstr.Attributes()), + model.metadata.ScopeInstr.DroppedAttributesCount(), + model.metadata.ScopeURL, + model.metricName, + model.metricDescription, + model.metricUnit, + attributesToMap(dp.Attributes()), + dp.StartTimestamp().AsTime(), + dp.Timestamp().AsTime(), + getValue(dp.IntValue(), dp.DoubleValue(), dp.ValueType()), + uint32(dp.Flags()), + attrs, + times, + values, + traceIDs, + spanIDs, + int32(model.sum.AggregationTemporality()), + model.sum.IsMonotonic(), + ) + if err != nil { + return fmt.Errorf("ExecContext:%w", err) + } + } + } return err }) duration := time.Since(start) diff --git a/exporter/clickhouseexporter/internal/summary_metrics.go b/exporter/clickhouseexporter/internal/summary_metrics.go index 93c117b4a099..a62c9cdb697f 100644 --- a/exporter/clickhouseexporter/internal/summary_metrics.go +++ b/exporter/clickhouseexporter/internal/summary_metrics.go @@ -7,7 +7,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "go.opentelemetry.io/collector/pdata/pcommon" @@ -70,12 +69,9 @@ SETTINGS index_granularity=8192, ttl_only_drop_parts = 1; Sum, ValueAtQuantiles.Quantile, ValueAtQuantiles.Value, - Flags) VALUES ` - summaryValueCounts = 18 + Flags) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)` ) -var summaryPlaceholders = newPlaceholder(summaryValueCounts) - type summaryModel struct { metricName string metricDescription string @@ -94,44 +90,46 @@ func (s *summaryMetrics) insert(ctx context.Context, db *sql.DB) error { if s.count == 0 { return nil } - - valueArgs := make([]any, s.count*summaryValueCounts) - var b strings.Builder - - index := 0 - for _, model := range s.summaryModel { - for i := 0; i < model.summary.DataPoints().Len(); i++ { - dp := model.summary.DataPoints().At(i) - b.WriteString(*summaryPlaceholders) - - valueArgs[index] = model.metadata.ResAttr - valueArgs[index+1] = model.metadata.ResURL - valueArgs[index+2] = model.metadata.ScopeInstr.Name() - valueArgs[index+3] = model.metadata.ScopeInstr.Version() - valueArgs[index+4] = attributesToMap(model.metadata.ScopeInstr.Attributes()) - valueArgs[index+5] = model.metadata.ScopeInstr.DroppedAttributesCount() - valueArgs[index+6] = model.metadata.ScopeURL - valueArgs[index+7] = model.metricName - valueArgs[index+8] = model.metricDescription - valueArgs[index+9] = model.metricUnit - valueArgs[index+10] = attributesToMap(dp.Attributes()) - valueArgs[index+11] = dp.StartTimestamp().AsTime().UnixNano() - valueArgs[index+12] = dp.Timestamp().AsTime().UnixNano() - valueArgs[index+13] = dp.Count() - valueArgs[index+14] = dp.Sum() - - quantiles, values := convertValueAtQuantile(dp.QuantileValues()) - valueArgs[index+15] = quantiles - valueArgs[index+16] = values - valueArgs[index+17] = uint32(dp.Flags()) - - index += summaryValueCounts - } - } - start := time.Now() err := doWithTx(ctx, db, func(tx *sql.Tx) error { - _, err := tx.ExecContext(ctx, fmt.Sprintf("%s %s", s.insertSQL, strings.TrimSuffix(b.String(), ",")), valueArgs...) + statement, err := tx.PrepareContext(ctx, s.insertSQL) + if err != nil { + return err + } + defer func() { + _ = statement.Close() + }() + for _, model := range s.summaryModel { + for i := 0; i < model.summary.DataPoints().Len(); i++ { + dp := model.summary.DataPoints().At(i) + quantiles, values := convertValueAtQuantile(dp.QuantileValues()) + + _, err = statement.ExecContext(ctx, + model.metadata.ResAttr, + model.metadata.ResURL, + model.metadata.ScopeInstr.Name(), + model.metadata.ScopeInstr.Version(), + attributesToMap(model.metadata.ScopeInstr.Attributes()), + model.metadata.ScopeInstr.DroppedAttributesCount(), + model.metadata.ScopeURL, + model.metricName, + model.metricDescription, + model.metricUnit, + attributesToMap(dp.Attributes()), + dp.StartTimestamp().AsTime(), + dp.Timestamp().AsTime(), + dp.Count(), + dp.Sum(), + quantiles, + values, + uint32(dp.Flags()), + ) + if err != nil { + return fmt.Errorf("ExecContext:%w", err) + } + } + } + return err }) duration := time.Since(start) diff --git a/exporter/coralogixexporter/README.md b/exporter/coralogixexporter/README.md index e717a67887be..4b3f7bef992e 100644 --- a/exporter/coralogixexporter/README.md +++ b/exporter/coralogixexporter/README.md @@ -103,7 +103,7 @@ Learn more about [AWS PrivateLink in the documentation page](https://coralogix.c ### Application and SubSystem attributes v0.62.0 release of OpenTelemetry Collector allows you to map Application name and Subsystem name to Resource attributes. -You need to set `application_name_attributes` and `subsystem_name_attributes` fields with a list of potential Resource attributes for the AppName and Subsystem values. The first not-empty Resource attribute is going to be used. +You need to set `application_name_attributes` and `subsystem_name_attributes` fields with a list of potential Resource attributes for the AppName and Subsystem values. The first not-empty Resource attribute is going to be used. If multiple resource attributes are available, **the order of the attributes in the list determines their priority.** ### Kubernetes attributes @@ -114,16 +114,17 @@ exporters: coralogix: domain: "coralogix.com" application_name_attributes: - - "service.namespace" - "k8s.namespace.name" + - "service.namespace" subsystem_name_attributes: - - "service.name" + - "k8s.job.name" - "k8s.deployment.name" - "k8s.statefulset.name" - "k8s.daemonset.name" - "k8s.cronjob.name" - - "k8s.job.name" - - "k8s.container.name" + - "k8s.pod.name" + - "k8s.node.name" + - "service.name" ``` ### Host Attributes diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index 850d4351e3f2..766a9a7790dd 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter/internal/metadata" ) @@ -124,8 +125,8 @@ func TestLoadConfig(t *testing.T) { WaitForReady: false, BalancerName: "", }, - AppNameAttributes: []string{"service.namespace"}, - SubSystemAttributes: []string{"service.name"}, + AppNameAttributes: []string{"service.namespace", "k8s.namespace.name"}, + SubSystemAttributes: []string{"service.name", "k8s.deployment.name", "k8s.statefulset.name", "k8s.daemonset.name", "k8s.cronjob.name", "k8s.job.name", "k8s.container.name"}, GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "https://", TLSSetting: configtls.TLSClientSetting{ @@ -270,3 +271,28 @@ func TestEndpoindsAndDomainWithAllExporters(t *testing.T) { require.NotNil(t, le, "failed to create logs exporter") require.NoError(t, le.start(context.Background(), componenttest.NewNopHost())) } + +func TestGetMetadataFromResource(t *testing.T) { + r1 := pcommon.NewResource() + r1.Attributes().PutStr("k8s.node.name", "node-test") + r1.Attributes().PutStr("k8s.container.name", "container-test") + r1.Attributes().PutStr("k8s.deployment.name", "deployment-test") + r1.Attributes().PutStr("k8s.namespace.name", "namespace-test") + + r2 := pcommon.NewResource() + r2.Attributes().PutStr("k8s.node.name", "node-test") + r2.Attributes().PutStr("k8s.namespace.name", "namespace-test") + + c := &Config{ + AppNameAttributes: []string{"k8s.container.name", "k8s.deployment.name", "k8s.node.name"}, + SubSystemAttributes: []string{"k8s.namespace.name", "k8s.node.name"}, + } + + appName, subSystemName := c.getMetadataFromResource(r1) + assert.Equal(t, "container-test", appName) + assert.Equal(t, "namespace-test", subSystemName) + + appName, subSystemName = c.getMetadataFromResource(r2) + assert.Equal(t, "node-test", appName) + assert.Equal(t, "namespace-test", subSystemName) +} diff --git a/exporter/coralogixexporter/testdata/config.yaml b/exporter/coralogixexporter/testdata/config.yaml index 0fa8c14f01b4..ca33cbeb4d2b 100644 --- a/exporter/coralogixexporter/testdata/config.yaml +++ b/exporter/coralogixexporter/testdata/config.yaml @@ -24,8 +24,15 @@ coralogix/all: endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" application_name_attributes: - "service.namespace" + - "k8s.namespace.name" subsystem_name_attributes: - "service.name" + - "k8s.deployment.name" + - "k8s.statefulset.name" + - "k8s.daemonset.name" + - "k8s.cronjob.name" + - "k8s.job.name" + - "k8s.container.name" private_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" application_name: "APP_NAME" subsystem_name: "SUBSYSTEM_NAME" diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 39f7e1c84ea3..dd2cf809b252 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.7.0 github.com/DataDog/sketches-go v1.4.2 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 @@ -104,7 +104,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/hashicorp/consul/api v1.24.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -208,7 +208,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 86d711eba728..d4ef4da3b243 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -118,8 +118,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/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -351,8 +351,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -1095,8 +1095,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/exporter/datasetexporter/go.mod b/exporter/datasetexporter/go.mod index 930d12708108..0089e038bb62 100644 --- a/exporter/datasetexporter/go.mod +++ b/exporter/datasetexporter/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datase go 1.20 require ( - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 // github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.77.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 - github.com/scalyr/dataset-go v0.12.1 + github.com/scalyr/dataset-go v0.14.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index d78d6b52d54f..b39e146104c6 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -107,8 +107,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -248,8 +248,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/scalyr/dataset-go v0.12.1 h1:B8xw2+HOW4B2i4BMEJyLhMcSEc35snjdyVIgOr8+dwI= -github.com/scalyr/dataset-go v0.12.1/go.mod h1:6Go51mPPv3TminPxEcbpmVki/UzXaMcrL4bseyziilQ= +github.com/scalyr/dataset-go v0.14.0 h1:uRkoUt6LcMcH3VUTjOakQ4aq+1ooJB2t47oqYRUkV/k= +github.com/scalyr/dataset-go v0.14.0/go.mod h1:+a4BvVyS7mKquK7ySuWh4vygyDBREQrdikdcnABYKFw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index ab986fd95b1a..3b193f7505f6 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -13,7 +13,7 @@ require ( go.opentelemetry.io/collector/exporter v0.83.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.83.0 golang.org/x/oauth2 v0.11.0 - google.golang.org/api v0.136.0 + google.golang.org/api v0.138.0 ) require ( @@ -28,7 +28,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/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index ae22fb02aa2c..2ba7cf84b9c2 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -123,8 +123,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= @@ -488,8 +488,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.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= diff --git a/exporter/fileexporter/buffered_writer_test.go b/exporter/fileexporter/buffered_writer_test.go index 30c9d7cfd0fb..a6512258d2fa 100644 --- a/exporter/fileexporter/buffered_writer_test.go +++ b/exporter/fileexporter/buffered_writer_test.go @@ -45,7 +45,7 @@ func TestBufferedWrites(t *testing.T) { } var ( - benchmarkErr error + errBenchmark error ) func BenchmarkWriter(b *testing.B) { @@ -83,7 +83,7 @@ func BenchmarkWriter(b *testing.B) { for i := 0; i < b.N; i++ { _, err = w.Write(payload) } - benchmarkErr = multierr.Combine(err, w.Close()) + errBenchmark = multierr.Combine(err, w.Close()) }) } } diff --git a/exporter/googlecloudexporter/README.md b/exporter/googlecloudexporter/README.md index c16787d37a62..7a277e51f22b 100644 --- a/exporter/googlecloudexporter/README.md +++ b/exporter/googlecloudexporter/README.md @@ -216,11 +216,6 @@ The following configuration options are supported: - `prefix`: Match resource keys by prefix. - `regex`: Match resource keys by regex. - `compression` (optional): Enable gzip compression for gRPC requests (valid vlaues: `gzip`). -- `retry_on_failure` (optional): Configuration for how to handle retries when sending data to Google Cloud fails. - - `enabled` (default = false) - - `initial_interval` (default = 5s): Time to wait after the first failure before retrying; ignored if `enabled` is `false` - - `max_interval` (default = 30s): Is the upper bound on backoff; ignored if `enabled` is `false` - - `max_elapsed_time` (default = 120s): Is the maximum amount of time spent trying to send a batch; ignored if `enabled` is `false` - `sending_queue` (optional): Configuration for how to buffer traces before sending. - `enabled` (default = true) - `num_consumers` (default = 10): Number of consumers that dequeue batches; ignored if `enabled` is `false` @@ -229,7 +224,7 @@ The following configuration options are supported: - `num_seconds` is the number of seconds to buffer in case of a backend outage - `requests_per_second` is the average number of requests per seconds. -Note: These `retry_on_failure` and `sending_queue` are provided (and documented) by the [Exporter Helper](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration) +Note: The `sending_queue` is provided (and documented) by the [Exporter Helper](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration) Beyond standard YAML configuration as outlined in the sections that follow, exporters that leverage the net/http package (all do today) also respect the diff --git a/exporter/googlecloudexporter/config.go b/exporter/googlecloudexporter/config.go index 4d1a7daea70d..b0f70727dca5 100644 --- a/exporter/googlecloudexporter/config.go +++ b/exporter/googlecloudexporter/config.go @@ -17,7 +17,6 @@ type Config struct { // Timeout for all API calls. If not set, defaults to 12 seconds. exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` - exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` } func (cfg *Config) Validate() error { diff --git a/exporter/googlecloudexporter/config_test.go b/exporter/googlecloudexporter/config_test.go index ad7c1eea3f95..cf024a0707ff 100644 --- a/exporter/googlecloudexporter/config_test.go +++ b/exporter/googlecloudexporter/config_test.go @@ -9,7 +9,6 @@ import ( "time" "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" - "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -65,14 +64,6 @@ func TestLoadConfig(t *testing.T) { }, }, }, - RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, - RandomizationFactor: backoff.DefaultRandomizationFactor, - Multiplier: backoff.DefaultMultiplier, - }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, NumConsumers: 2, diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index 502ba9ffcfcb..1ca70a165504 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -43,11 +43,8 @@ func NewFactory() exporter.Factory { // createDefaultConfig creates the default configuration for exporter. func createDefaultConfig() component.Config { - retrySettings := exporterhelper.NewDefaultRetrySettings() - retrySettings.Enabled = false return &Config{ TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, - RetrySettings: retrySettings, QueueSettings: exporterhelper.NewDefaultQueueSettings(), Config: collector.DefaultConfig(), } @@ -58,7 +55,7 @@ func createLogsExporter( params exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) { eCfg := cfg.(*Config) - logsExporter, err := collector.NewGoogleCloudLogsExporter(ctx, eCfg.Config, params.TelemetrySettings.Logger) + logsExporter, err := collector.NewGoogleCloudLogsExporter(ctx, eCfg.Config, params.TelemetrySettings.Logger, params.BuildInfo.Version) if err != nil { return nil, err } @@ -71,8 +68,7 @@ func createLogsExporter( // Disable exporterhelper Timeout, since we are using a custom mechanism // within exporter itself exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), - exporterhelper.WithQueue(eCfg.QueueSettings), - exporterhelper.WithRetry(eCfg.RetrySettings)) + exporterhelper.WithQueue(eCfg.QueueSettings)) } // createTracesExporter creates a trace exporter based on this config. @@ -94,8 +90,7 @@ func createTracesExporter( // Disable exporterhelper Timeout, since we are using a custom mechanism // within exporter itself exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), - exporterhelper.WithQueue(eCfg.QueueSettings), - exporterhelper.WithRetry(eCfg.RetrySettings)) + exporterhelper.WithQueue(eCfg.QueueSettings)) } // createMetricsExporter creates a metrics exporter based on this config. @@ -117,6 +112,5 @@ func createMetricsExporter( // Disable exporterhelper Timeout, since we are using a custom mechanism // within exporter itself exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), - exporterhelper.WithQueue(eCfg.QueueSettings), - exporterhelper.WithRetry(eCfg.RetrySettings)) + exporterhelper.WithQueue(eCfg.QueueSettings)) } diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 17cf2202a320..9d20188caba7 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -3,8 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google go 1.20 require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 - github.com/cenkalti/backoff/v4 v4.2.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 @@ -20,8 +19,9 @@ require ( cloud.google.com/go/longrunning v0.5.1 // indirect cloud.google.com/go/monitoring v1.15.1 // indirect cloud.google.com/go/trace v1.10.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect @@ -30,7 +30,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -70,7 +70,7 @@ require ( golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - google.golang.org/api v0.136.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 6ae7a34fa69a..fb5e114b1b8b 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -6,7 +6,6 @@ cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopT cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= 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.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I= cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= @@ -17,13 +16,13 @@ cloud.google.com/go/trace v1.10.1 h1:EwGdOLCNfYOOPtgqo+D2sDLZmRCEO1AagRTJCU6ztdg cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 h1:1iUFJlwEsO3jbEitj0i9+XIjaY1QsjnUy7J3J81HuH4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0/go.mod h1:otJdxGjog6MfV/93oprfeXgyFrGrqsVvDhdM6P779Rk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 h1:82lUmcpHzBEpGP4qURZvMSU1rJV0AAfXtOCh7Qz6oDw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0/go.mod h1:6abS6wU43wU97qP+JseSJq2+C8/XL50co74AhoMJwwU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.42.0 h1:thAXdOpdEJPWW7kZmD8wU/yhQjd7PA6L01TxFcR5OOY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 h1:4gL61NwEDGAFvLJeEMjTYJm6r1T26k3QYuDZK9YEaAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 h1:2oH2ROo0TCtGYIga4Mp78lQsERv6Ki9nmIkqiy5tQgM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1/go.mod h1:mp8K83k9NeKyqV3LZPOqTi2aaH+gx1zALp0mlYYkjB4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 h1:lP8YpTi26Bei2OrXpQEUnNFPqKT6bTn3P8DvJC4i8WQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1/go.mod h1:g9zEQ45EhrGGA6HyCtxi8yL0BZ0vD+pVaqSkiLjVIzY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.43.1 h1:EA/FmSYRyeL2ZogHD8ZCPAt96UZh/U76wQjGhzRFEHE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 h1:ti4stlXHjDhGl+1h+EpqXv9+Wxv0XqCB3XTT4W6ZoQU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1/go.mod h1:lv7cjEH/BKG+7xh3vR4T8//UkWZ9eIkgAk6HpN/T6rk= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -138,8 +137,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= @@ -494,8 +493,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.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= diff --git a/exporter/googlecloudexporter/testdata/config.yaml b/exporter/googlecloudexporter/testdata/config.yaml index 9a3a845d3512..41bc1884af54 100644 --- a/exporter/googlecloudexporter/testdata/config.yaml +++ b/exporter/googlecloudexporter/testdata/config.yaml @@ -7,11 +7,6 @@ googlecloud/customname: enabled: true num_consumers: 2 queue_size: 10 - retry_on_failure: - enabled: true - initial_interval: 10s - max_interval: 60s - max_elapsed_time: 10m metric: prefix: prefix skip_create_descriptor: true diff --git a/exporter/googlecloudexporter/testdata/legacyconfig.yaml b/exporter/googlecloudexporter/testdata/legacyconfig.yaml deleted file mode 100644 index 98744fd4ee26..000000000000 --- a/exporter/googlecloudexporter/testdata/legacyconfig.yaml +++ /dev/null @@ -1,45 +0,0 @@ -receivers: - nop: - -processors: - nop: - -exporters: - googlecloud: - googlecloud/customname: - project: my-project - endpoint: test-endpoint - user_agent: opentelemetry-collector-contrib {{version}} - use_insecure: true - timeout: 20s - resource_mappings: - - source_type: source.resource1 - target_type: target-resource1 - label_mappings: - - source_key: contrib.opencensus.io/exporter/googlecloud/project_id - target_key: project_id - optional: true - - source_key: source.label1 - target_key: target_label_1 - - source_type: source.resource2 - target_type: target-resource2 - sending_queue: - enabled: true - num_consumers: 2 - queue_size: 10 - retry_on_failure: - enabled: true - initial_interval: 10s - max_interval: 60s - max_elapsed_time: 10m - metric: - prefix: prefix - skip_create_descriptor: true - -service: - pipelines: - traces: - receivers: [nop] - processors: [nop] - exporters: [googlecloud] - diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index b6cd1817e3e9..6dbf1c0a8a91 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( cloud.google.com/go/pubsub v1.33.0 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/collector/exporter v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.uber.org/zap v1.25.0 - google.golang.org/api v0.136.0 + google.golang.org/api v0.138.0 google.golang.org/grpc v1.57.0 ) @@ -27,7 +27,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 3d51286d189f..23e8459c3d4b 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -121,11 +121,11 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= @@ -461,8 +461,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.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= diff --git a/exporter/googlemanagedprometheusexporter/README.md b/exporter/googlemanagedprometheusexporter/README.md index 5327eca34f08..592e15c530e5 100644 --- a/exporter/googlemanagedprometheusexporter/README.md +++ b/exporter/googlemanagedprometheusexporter/README.md @@ -28,17 +28,13 @@ The following configuration options are supported: - `compression` (optional): Compression format for Metrics gRPC requests. Supported values: [`gzip`]. Defaults to no compression. - `grpc_pool_size` (optional): Sets the size of the connection pool in the GCP client. Defaults to a single connection. - `use_insecure` (optional): If true, disables gRPC client transport security. Only has applies if Endpoint is not "". + - `add_metric_suffixes` (default=`true`): Add type and unit suffixes to metrics. - `extra_metrics_config` (optional): Enable or disable additional metrics. - `enable_target_info` (default=`true`): Add `target_info` metric based on resource. - `enable_scope_info` (default=`true`): Add `otel_scope_info` metric and `scope_name`/`scope_version` attributes to all other metrics. - `resource_filters` (optional): Provides a list of filters to match resource attributes which will be included in metric labels. - `prefix` (optional): Match resource attribute keys by prefix. - `regex` (optional): Match resource attribute keys by regex. -- `retry_on_failure` (optional): Configuration for how to handle retries when sending data to Google Cloud fails. - - `enabled` (default = false) - - `initial_interval` (default = 5s): Time to wait after the first failure before retrying; ignored if `enabled` is `false` - - `max_interval` (default = 30s): Is the upper bound on backoff; ignored if `enabled` is `false` - - `max_elapsed_time` (default = 120s): Is the maximum amount of time spent trying to send a batch; ignored if `enabled` is `false` - `sending_queue` (optional): Configuration for how to buffer traces before sending. - `enabled` (default = true) - `num_consumers` (default = 10): Number of consumers that dequeue batches; ignored if `enabled` is `false` @@ -47,7 +43,7 @@ The following configuration options are supported: - `num_seconds` is the number of seconds to buffer in case of a backend outage - `requests_per_second` is the average number of requests per seconds. -Note: These `retry_on_failure` and `sending_queue` are provided (and documented) by the [Exporter Helper](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration) +Note: The `sending_queue` is provided (and documented) by the [Exporter Helper](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration) ## Example Configuration @@ -163,7 +159,7 @@ processors: resource: attributes: - key: "location" - value: "us-east-1" + value: "us-east1" action: upsert ``` diff --git a/exporter/googlemanagedprometheusexporter/config.go b/exporter/googlemanagedprometheusexporter/config.go index 2d1513f131e9..41708ad3b93f 100644 --- a/exporter/googlemanagedprometheusexporter/config.go +++ b/exporter/googlemanagedprometheusexporter/config.go @@ -9,7 +9,6 @@ import ( "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/pdata/pmetric" ) // Config defines configuration for Google Cloud Managed Service for Prometheus exporter. @@ -19,7 +18,6 @@ type Config struct { // Timeout for all API calls. If not set, defaults to 12 seconds. exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` - exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` } // GMPConfig is a subset of the collector config applicable to the GMP exporter. @@ -32,18 +30,10 @@ type GMPConfig struct { type MetricConfig struct { // Prefix configures the prefix of metrics sent to GoogleManagedPrometheus. Defaults to prometheus.googleapis.com. // Changing this prefix is not recommended, as it may cause metrics to not be queryable with promql in the Cloud Monitoring UI. - Prefix string `mapstructure:"prefix"` - ClientConfig collector.ClientConfig `mapstructure:",squash"` - ExtraMetricsConfig ExtraMetricsConfig `mapstructure:"extra_metrics_config"` - ResourceFilters []collector.ResourceFilter `mapstructure:"resource_filters"` -} - -// ExtraMetricsConfig controls the inclusion of additional metrics. -type ExtraMetricsConfig struct { - // Add `target_info` metric based on the resource. On by default. - EnableTargetInfo bool `mapstructure:"enable_target_info"` - // Add `otel_scope_info` metric and `scope_name`/`scope_version` attributes to all other metrics. On by default. - EnableScopeInfo bool `mapstructure:"enable_scope_info"` + Prefix string `mapstructure:"prefix"` + ClientConfig collector.ClientConfig `mapstructure:",squash"` + Config googlemanagedprometheus.Config `mapstructure:",squash"` + ResourceFilters []collector.ResourceFilter `mapstructure:"resource_filters"` } func (c *GMPConfig) toCollectorConfig() collector.Config { @@ -57,30 +47,16 @@ func (c *GMPConfig) toCollectorConfig() collector.Config { cfg.MetricConfig.InstrumentationLibraryLabels = false cfg.MetricConfig.ServiceResourceLabels = false // Update metric naming to match GMP conventions - cfg.MetricConfig.GetMetricName = googlemanagedprometheus.GetMetricName + cfg.MetricConfig.GetMetricName = c.MetricConfig.Config.GetMetricName // Map to the prometheus_target monitored resource - cfg.MetricConfig.MapMonitoredResource = googlemanagedprometheus.MapToPrometheusTarget + cfg.MetricConfig.MapMonitoredResource = c.MetricConfig.Config.MapToPrometheusTarget + cfg.MetricConfig.ExtraMetrics = c.MetricConfig.Config.ExtraMetrics cfg.MetricConfig.EnableSumOfSquaredDeviation = true // map the GMP config's fields to the collector config cfg.ProjectID = c.ProjectID cfg.UserAgent = c.UserAgent cfg.MetricConfig.ClientConfig = c.MetricConfig.ClientConfig cfg.MetricConfig.ResourceFilters = c.MetricConfig.ResourceFilters - - // add target_info and scope_info metrics - extraMetricsFuncs := make([]func(m pmetric.Metrics), 0) - if c.MetricConfig.ExtraMetricsConfig.EnableTargetInfo { - extraMetricsFuncs = append(extraMetricsFuncs, googlemanagedprometheus.AddTargetInfoMetric) - } - if c.MetricConfig.ExtraMetricsConfig.EnableScopeInfo { - extraMetricsFuncs = append(extraMetricsFuncs, googlemanagedprometheus.AddScopeInfoMetric) - } - cfg.MetricConfig.ExtraMetrics = func(m pmetric.Metrics) pmetric.ResourceMetricsSlice { - for _, extraMetricsFunc := range extraMetricsFuncs { - extraMetricsFunc(m) - } - return m.ResourceMetrics() - } return cfg } @@ -88,5 +64,8 @@ func (cfg *Config) Validate() error { if err := collector.ValidateConfig(cfg.toCollectorConfig()); err != nil { return fmt.Errorf("exporter settings are invalid :%w", err) } + if err := cfg.MetricConfig.Config.Validate(); err != nil { + return fmt.Errorf("exporter settings are invalid :%w", err) + } return nil } diff --git a/exporter/googlemanagedprometheusexporter/config_test.go b/exporter/googlemanagedprometheusexporter/config_test.go index 79c53e1e810d..deca503ecf01 100644 --- a/exporter/googlemanagedprometheusexporter/config_test.go +++ b/exporter/googlemanagedprometheusexporter/config_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/cenkalti/backoff/v4" + "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -29,7 +29,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NotNil(t, cfg) - assert.Equal(t, len(cfg.Exporters), 3) + assert.Equal(t, len(cfg.Exporters), 2) r0 := cfg.Exporters[component.NewID(metadata.Type)].(*Config) assert.Equal(t, r0, factory.CreateDefaultConfig().(*Config)) @@ -44,29 +44,20 @@ func TestLoadConfig(t *testing.T) { ProjectID: "my-project", UserAgent: "opentelemetry-collector-contrib {{version}}", MetricConfig: MetricConfig{ - ExtraMetricsConfig: ExtraMetricsConfig{ - EnableTargetInfo: true, - EnableScopeInfo: true, + Config: googlemanagedprometheus.Config{ + AddMetricSuffixes: false, + ExtraMetricsConfig: googlemanagedprometheus.ExtraMetricsConfig{ + EnableTargetInfo: false, + EnableScopeInfo: false, + }, }, + Prefix: "my-metric-domain.com", }, }, - RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, - RandomizationFactor: backoff.DefaultRandomizationFactor, - Multiplier: backoff.DefaultMultiplier, - }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, NumConsumers: 2, QueueSize: 10, }, }) - - r2 := cfg.Exporters[component.NewIDWithName(metadata.Type, "customprefix")].(*Config) - r2Expected := factory.CreateDefaultConfig().(*Config) - r2Expected.GMPConfig.MetricConfig.Prefix = "my-metric-domain.com" - assert.Equal(t, r2, r2Expected) } diff --git a/exporter/googlemanagedprometheusexporter/factory.go b/exporter/googlemanagedprometheusexporter/factory.go index e28004ee752c..27e254c854b9 100644 --- a/exporter/googlemanagedprometheusexporter/factory.go +++ b/exporter/googlemanagedprometheusexporter/factory.go @@ -10,6 +10,7 @@ import ( "time" "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" + "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -32,18 +33,12 @@ func NewFactory() exporter.Factory { // createDefaultConfig creates the default configuration for exporter. func createDefaultConfig() component.Config { - retrySettings := exporterhelper.NewDefaultRetrySettings() - retrySettings.Enabled = false return &Config{ TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, - RetrySettings: retrySettings, QueueSettings: exporterhelper.NewDefaultQueueSettings(), GMPConfig: GMPConfig{ MetricConfig: MetricConfig{ - ExtraMetricsConfig: ExtraMetricsConfig{ - EnableTargetInfo: true, - EnableScopeInfo: true, - }, + Config: googlemanagedprometheus.DefaultConfig(), }, }, } @@ -68,6 +63,5 @@ func createMetricsExporter( // Disable exporterhelper Timeout, since we are using a custom mechanism // within exporter itself exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), - exporterhelper.WithQueue(eCfg.QueueSettings), - exporterhelper.WithRetry(eCfg.RetrySettings)) + exporterhelper.WithQueue(eCfg.QueueSettings)) } diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index e6abc9f051cb..a4c56f59c559 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -3,14 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google go 1.20 require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 - github.com/cenkalti/backoff/v4 v4.2.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.83.0 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/exporter v0.83.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 ) require ( @@ -22,9 +20,10 @@ require ( cloud.google.com/go/monitoring v1.15.1 // indirect cloud.google.com/go/trace v1.10.1 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -37,8 +36,8 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect @@ -80,6 +79,7 @@ require ( go.opentelemetry.io/collector/consumer v0.83.0 // indirect go.opentelemetry.io/collector/extension v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect + go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/collector/receiver v0.83.0 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect @@ -107,8 +107,8 @@ require ( golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 505bf48e5271..60eba122cf6d 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -27,7 +27,6 @@ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGB 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/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I= cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= @@ -50,15 +49,15 @@ contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 h1:1iUFJlwEsO3jbEitj0i9+XIjaY1QsjnUy7J3J81HuH4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0/go.mod h1:otJdxGjog6MfV/93oprfeXgyFrGrqsVvDhdM6P779Rk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 h1:Fa7XySHYw2HdumRuo2TYiYK5LkGJuwzTiqAPFoZ7t1s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0/go.mod h1:7BFtqicd8QzUKtbxBHq8/by6aMYL3mmnEEK0vLtVins= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 h1:82lUmcpHzBEpGP4qURZvMSU1rJV0AAfXtOCh7Qz6oDw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0/go.mod h1:6abS6wU43wU97qP+JseSJq2+C8/XL50co74AhoMJwwU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.42.0 h1:thAXdOpdEJPWW7kZmD8wU/yhQjd7PA6L01TxFcR5OOY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 h1:4gL61NwEDGAFvLJeEMjTYJm6r1T26k3QYuDZK9YEaAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 h1:2oH2ROo0TCtGYIga4Mp78lQsERv6Ki9nmIkqiy5tQgM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1/go.mod h1:mp8K83k9NeKyqV3LZPOqTi2aaH+gx1zALp0mlYYkjB4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 h1:RZIhpzvjXPF4o7RPBXuyPMhHF0mhCRwtN3h1hPT8DBE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1/go.mod h1:wNaetbDWzGD7k9d1/e0FQSy8qoF3vG2c4PkHgIWnmns= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 h1:lP8YpTi26Bei2OrXpQEUnNFPqKT6bTn3P8DvJC4i8WQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1/go.mod h1:g9zEQ45EhrGGA6HyCtxi8yL0BZ0vD+pVaqSkiLjVIzY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.43.1 h1:EA/FmSYRyeL2ZogHD8ZCPAt96UZh/U76wQjGhzRFEHE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 h1:ti4stlXHjDhGl+1h+EpqXv9+Wxv0XqCB3XTT4W6ZoQU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1/go.mod h1:lv7cjEH/BKG+7xh3vR4T8//UkWZ9eIkgAk6HpN/T6rk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -218,11 +217,11 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -772,8 +771,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= @@ -790,8 +789,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/exporter/googlemanagedprometheusexporter/testdata/config.yaml b/exporter/googlemanagedprometheusexporter/testdata/config.yaml index 366d19ab159b..db8c177c4f8e 100644 --- a/exporter/googlemanagedprometheusexporter/testdata/config.yaml +++ b/exporter/googlemanagedprometheusexporter/testdata/config.yaml @@ -14,14 +14,12 @@ exporters: enabled: true num_consumers: 2 queue_size: 10 - retry_on_failure: - enabled: true - initial_interval: 10s - max_interval: 60s - max_elapsed_time: 10m - googlemanagedprometheus/customprefix: metric: prefix: my-metric-domain.com + add_metric_suffixes: false + extra_metrics_config: + enable_target_info: false + enable_scope_info: false service: diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index d1a72b2d1579..59d2be7551bf 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/IBM/sarama v1.40.1 - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/cenkalti/backoff/v4 v4.2.1 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.41.0 diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 9b70f8525332..dbbe2d01dd55 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -18,8 +18,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/exporter/loadbalancingexporter/README.md b/exporter/loadbalancingexporter/README.md index 999f7da1d744..e827f007b76a 100644 --- a/exporter/loadbalancingexporter/README.md +++ b/exporter/loadbalancingexporter/README.md @@ -4,12 +4,13 @@ | Status | | | ------------- |-----------| | Stability | [beta]: traces, logs | -| Distributions | [contrib], [grafana], [observiq], [sumo] | +| Distributions | [contrib], [aws], [grafana], [observiq], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Floadbalancing%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Floadbalancing) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Floadbalancing%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Floadbalancing) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[aws]: https://github.com/aws-observability/aws-otel-collector [grafana]: https://github.com/grafana/agent [observiq]: https://github.com/observIQ/observiq-otel-collector [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 63bc1efa8036..b5c933e8b3e8 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -48,7 +48,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/imdario/mergo v0.3.6 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -118,7 +118,7 @@ require ( golang.org/x/term v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 34583d4a6412..88e6580f4e0e 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -841,8 +841,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -1627,8 +1628,8 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= diff --git a/exporter/loadbalancingexporter/metadata.yaml b/exporter/loadbalancingexporter/metadata.yaml index deae6432cd2f..52635ae09567 100644 --- a/exporter/loadbalancingexporter/metadata.yaml +++ b/exporter/loadbalancingexporter/metadata.yaml @@ -9,5 +9,6 @@ status: - grafana - observiq - sumo + - aws codeowners: active: [jpkrohling] diff --git a/exporter/loadbalancingexporter/resolver_k8s_handler.go b/exporter/loadbalancingexporter/resolver_k8s_handler.go index b83e0f88de73..f879f22f4213 100644 --- a/exporter/loadbalancingexporter/resolver_k8s_handler.go +++ b/exporter/loadbalancingexporter/resolver_k8s_handler.go @@ -44,15 +44,24 @@ func (h handler) OnAdd(obj interface{}, _ bool) { } func (h handler) OnUpdate(oldObj, newObj interface{}) { - switch oldObj.(type) { + switch oldEps := oldObj.(type) { case *corev1.Endpoints: + epRemove := convertToEndpoints(oldEps) + for _, ep := range epRemove { + h.endpoints.Delete(ep) + } + if len(epRemove) > 0 { + _, _ = h.callback(context.Background()) + } + newEps, ok := newObj.(*corev1.Endpoints) if !ok { + h.logger.Warn("Got an unexpected Kubernetes data type during the update of the pods for a service", zap.Any("obj", newObj)) + _ = stats.RecordWithTags(context.Background(), k8sResolverSuccessFalseMutators, mNumResolutions.M(1)) return } - endpoints := convertToEndpoints(newEps) changed := false - for _, ep := range endpoints { + for _, ep := range convertToEndpoints(newEps) { if _, loaded := h.endpoints.LoadOrStore(ep, true); !loaded { changed = true } diff --git a/exporter/loadbalancingexporter/resolver_k8s_test.go b/exporter/loadbalancingexporter/resolver_k8s_test.go index d11c40408279..9e7a1fe14b6d 100644 --- a/exporter/loadbalancingexporter/resolver_k8s_test.go +++ b/exporter/loadbalancingexporter/resolver_k8s_test.go @@ -5,6 +5,7 @@ package loadbalancingexporter import ( "context" + "fmt" "testing" "time" @@ -45,9 +46,13 @@ func TestK8sResolve(t *testing.T) { }, }, } - expectInit := []string{ - "192.168.10.100:8080", - "192.168.10.100:9090", + var expectInit []string + for _, subset := range endpoint.Subsets { + for _, address := range subset.Addresses { + for _, port := range args.ports { + expectInit = append(expectInit, fmt.Sprintf("%s:%d", address.IP, port)) + } + } } cl := fake.NewSimpleClientset(endpoint) @@ -74,7 +79,7 @@ func TestK8sResolve(t *testing.T) { verifyFn func(*suiteContext, args) error }{ { - name: "simulate changes to the backend ip address", + name: "simulate append the backend ip address", args: args{ logger: zap.NewNop(), service: "lb", @@ -111,6 +116,41 @@ func TestK8sResolve(t *testing.T) { return nil }, }, + { + name: "simulate change the backend ip address", + args: args{ + logger: zap.NewNop(), + service: "lb", + namespace: "default", + ports: []int32{4317}, + }, + simulateFn: func(suiteCtx *suiteContext, args args) error { + endpoint, exist := suiteCtx.endpoint.DeepCopy(), suiteCtx.endpoint.DeepCopy() + endpoint.Subsets = []corev1.EndpointSubset{ + {Addresses: []corev1.EndpointAddress{{IP: "10.10.0.11"}}}, + } + patch := client.MergeFrom(exist) + data, err := patch.Data(endpoint) + if err != nil { + return err + } + _, err = suiteCtx.clientset.CoreV1().Endpoints(args.namespace). + Patch(context.TODO(), args.service, types.MergePatchType, data, metav1.PatchOptions{}) + return err + + }, + verifyFn: func(ctx *suiteContext, args args) error { + if _, err := ctx.resolver.resolve(context.Background()); err != nil { + return err + } + + assert.Equal(t, []string{ + "10.10.0.11:4317", + }, ctx.resolver.Endpoints(), "resolver failed, endpoints not equal") + + return nil + }, + }, { name: "simulate deletion of backends", args: args{ diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index 05789b3f194f..43116f90fd67 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -28,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 18c1cc53de3c..7f703c4676f8 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -114,8 +114,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 260bf6e1a4d0..adfb3278dc5a 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -59,10 +59,10 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect golang.org/x/net v0.14.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index cc415a006289..66bc6c2cbec5 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -337,17 +337,17 @@ go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8a go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/exporter/opensearchexporter/README.md b/exporter/opensearchexporter/README.md index 2ce4a6db96c0..e048b4577d05 100644 --- a/exporter/opensearchexporter/README.md +++ b/exporter/opensearchexporter/README.md @@ -1,10 +1,15 @@ # OpenSearch Exporter -| Status | | -| ------------------------ |-----------| -| Stability | [devel] | -| Supported pipeline types | traces | -| Distributions | [contrib] | + +| Status | | +| ------------- |-----------| +| Stability | [development]: traces | +| Distributions | [] | +| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fopensearch%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fopensearch) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fopensearch%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fopensearch) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@Aneurysm9](https://www.github.com/Aneurysm9), [@MitchellGale](https://www.github.com/MitchellGale), [@MaxKsyunz](https://www.github.com/MaxKsyunz), [@YANG-DB](https://www.github.com/YANG-DB) | + +[development]: https://github.com/open-telemetry/opentelemetry-collector#development + OpenSearch exporter supports sending OpenTelemetry signals as documents to [OpenSearch](https://www.opensearch.org). @@ -17,7 +22,7 @@ The documents are sent using [observability catalog](https://github.com/opensear ### HTTP Connection Options OpenSearch export supports standard (HTTP client settings](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp#client-configuration). -- `endpoint` (required) `:` of OpenSearch node to send data to. +- `http.endpoint` (required) `:` of OpenSearch node to send data to. ### TLS settings Supports standard TLS settings as part of HTTP settings. See [TLS Configuration/Client Settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md#client-configuration). @@ -25,6 +30,8 @@ Supports standard TLS settings as part of HTTP settings. See [TLS Configuration/ ### Retry Options - `retry_on_failure`: See [retry_on_failure](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md) +### Timeout Options +- `timeout` : See [timeout](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md) ## Example ```yaml @@ -36,9 +43,10 @@ extensions: exporters: opensearch/trace: - endpoint: https://opensearch.example.com:9200 - auth: - authenticator: basicauth/client + http: + endpoint: https://opensearch.example.com:9200 + auth: + authenticator: basicauth/client # ······ service: pipelines: @@ -47,5 +55,3 @@ service: exporters: [opensearch/trace] processors: [batch] ``` -[devel]:https://github.com/open-telemetry/opentelemetry-collector#development -[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib \ No newline at end of file diff --git a/exporter/opensearchexporter/config.go b/exporter/opensearchexporter/config.go index 97f7b443c596..225c6c2c6811 100644 --- a/exporter/opensearchexporter/config.go +++ b/exporter/opensearchexporter/config.go @@ -8,24 +8,43 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.uber.org/multierr" +) + +const ( + // defaultNamespace value is used as ssoTracesExporter.Namespace when component.Config.Namespace is not set. + defaultNamespace = "namespace" + + // defaultDataset value is used as ssoTracesExporter.Dataset when component.Config.Dataset is not set. + defaultDataset = "default" ) // Config defines configuration for OpenSearch exporter. type Config struct { - confighttp.HTTPClientSettings `mapstructure:",squash"` - exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` - Namespace string `mapstructure:"namespace"` - Dataset string `mapstructure:"dataset"` + confighttp.HTTPClientSettings `mapstructure:"http"` + exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` + exporterhelper.TimeoutSettings `mapstructure:",squash"` + Namespace string `mapstructure:"namespace"` + Dataset string `mapstructure:"dataset"` } var ( errConfigNoEndpoint = errors.New("endpoint must be specified") + errDatasetNoValue = errors.New("dataset must be specified") + errNamespaceNoValue = errors.New("namespace must be specified") ) // Validate validates the opensearch server configuration. func (cfg *Config) Validate() error { + var multiErr []error if len(cfg.Endpoint) == 0 { - return errConfigNoEndpoint + multiErr = append(multiErr, errConfigNoEndpoint) + } + if len(cfg.Dataset) == 0 { + multiErr = append(multiErr, errDatasetNoValue) + } + if len(cfg.Namespace) == 0 { + multiErr = append(multiErr, errNamespaceNoValue) } - return nil + return multierr.Combine(multiErr...) } diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index 3f6b2a7c13c1..1993f94ea3a8 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -16,6 +16,8 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter/internal/metadata" ) func TestLoadConfig(t *testing.T) { @@ -24,8 +26,10 @@ func TestLoadConfig(t *testing.T) { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) - defaultCfg := newDefaultConfig() - defaultCfg.(*Config).Endpoint = "https://opensearch.example.com:9200" + sampleEndpoint := "https://opensearch.example.com:9200" + sampleCfg := withDefaultConfig(func(config *Config) { + config.Endpoint = sampleEndpoint + }) maxIdleConns := 100 idleConnTimeout := 90 * time.Second @@ -35,17 +39,17 @@ func TestLoadConfig(t *testing.T) { configValidateAssert assert.ErrorAssertionFunc }{ { - id: component.NewIDWithName(typeStr, ""), - expected: defaultCfg, + id: component.NewIDWithName(metadata.Type, ""), + expected: sampleCfg, configValidateAssert: assert.NoError, }, { - id: component.NewIDWithName(typeStr, "trace"), + id: component.NewIDWithName(metadata.Type, "trace"), expected: &Config{ Dataset: "ngnix", Namespace: "eu", HTTPClientSettings: confighttp.HTTPClientSettings{ - Endpoint: "https://opensearch.example.com:9200", + Endpoint: sampleEndpoint, Timeout: 2 * time.Minute, Headers: map[string]configopaque.String{ "myheader": "test", @@ -65,6 +69,28 @@ func TestLoadConfig(t *testing.T) { }, configValidateAssert: assert.NoError, }, + { + id: component.NewIDWithName(metadata.Type, "empty_dataset"), + expected: withDefaultConfig(func(config *Config) { + config.Endpoint = sampleEndpoint + config.Dataset = "" + config.Namespace = "eu" + }), + configValidateAssert: func(t assert.TestingT, err error, i ...interface{}) bool { + return assert.ErrorContains(t, err, errDatasetNoValue.Error()) + }, + }, + { + id: component.NewIDWithName(metadata.Type, "empty_namespace"), + expected: withDefaultConfig(func(config *Config) { + config.Endpoint = sampleEndpoint + config.Dataset = "ngnix" + config.Namespace = "" + }), + configValidateAssert: func(t assert.TestingT, err error, i ...interface{}) bool { + return assert.ErrorContains(t, err, errNamespaceNoValue.Error()) + }, + }, } for _, tt := range tests { @@ -82,3 +108,13 @@ func TestLoadConfig(t *testing.T) { }) } } + +// withDefaultConfig create a new default configuration +// and applies provided functions to it. +func withDefaultConfig(fns ...func(*Config)) *Config { + cfg := newDefaultConfig().(*Config) + for _, fn := range fns { + fn(cfg) + } + return cfg +} diff --git a/exporter/opensearchexporter/factory.go b/exporter/opensearchexporter/factory.go index 9c2f66a55161..500948763b16 100644 --- a/exporter/opensearchexporter/factory.go +++ b/exporter/opensearchexporter/factory.go @@ -1,6 +1,8 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +//go:generate mdatagen metadata.yaml + package opensearchexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter" import ( @@ -8,32 +10,27 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/pdata/ptrace" -) -const ( - // The value of "type" key in configuration. - typeStr = "opensearch" - // The stability level of the exporter. - stability = component.StabilityLevelDevelopment + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter/internal/metadata" ) // NewFactory creates a factory for OpenSearch exporter. func NewFactory() exporter.Factory { return exporter.NewFactory( - typeStr, + metadata.Type, newDefaultConfig, - exporter.WithTraces(createTracesExporter, stability), + exporter.WithTraces(createTracesExporter, metadata.TracesStability), ) } func newDefaultConfig() component.Config { return &Config{ HTTPClientSettings: confighttp.NewDefaultHTTPClientSettings(), - Namespace: "namespace", - Dataset: "default", + Namespace: defaultNamespace, + Dataset: defaultDataset, RetrySettings: exporterhelper.NewDefaultRetrySettings(), } } @@ -41,11 +38,16 @@ func newDefaultConfig() component.Config { func createTracesExporter(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) { + c := cfg.(*Config) + te, e := newSSOTracesExporter(c, set) + if e != nil { + return nil, e + } - return exporterhelper.NewTracesExporter(ctx, set, cfg, func(ctx context.Context, ld ptrace.Traces) error { - return nil - }, - exporterhelper.WithShutdown(func(ctx context.Context) error { - return nil - })) + return exporterhelper.NewTracesExporter(ctx, set, cfg, + te.pushTraceData, + exporterhelper.WithStart(te.Start), + exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), + exporterhelper.WithRetry(c.RetrySettings), + exporterhelper.WithTimeout(c.TimeoutSettings)) } diff --git a/exporter/opensearchexporter/factory_test.go b/exporter/opensearchexporter/factory_test.go new file mode 100644 index 000000000000..9331e616d1bf --- /dev/null +++ b/exporter/opensearchexporter/factory_test.go @@ -0,0 +1,50 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opensearchexporter + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/exporter/exportertest" +) + +func TestCreateDefaultConfig(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + assert.NotNil(t, cfg, "failed to create default config") + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) +} + +func TestFactory_CreateMetricsExporter_Fail(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + params := exportertest.NewNopCreateSettings() + _, err := factory.CreateMetricsExporter(context.Background(), params, cfg) + require.Error(t, err, "expected an error when creating a traces exporter") +} + +func TestFactory_CreateTracesExporter_Fail(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + params := exportertest.NewNopCreateSettings() + _, err := factory.CreateTracesExporter(context.Background(), params, cfg) + require.Error(t, err, "expected an error when creating a traces exporter") +} + +func TestFactory_CreateTracesExporter(t *testing.T) { + factory := NewFactory() + cfg := withDefaultConfig(func(cfg *Config) { + cfg.Endpoint = "https://opensearch.example.com:9200" + }) + params := exportertest.NewNopCreateSettings() + exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) + require.NoError(t, err) + require.NotNil(t, exporter) + + require.NoError(t, exporter.Shutdown(context.TODO())) +} diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index a0175386ff1d..0885f570c20c 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -3,14 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opense go 1.20 require ( + github.com/opensearch-project/opensearch-go/v2 v2.3.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/config/configauth v0.83.0 go.opentelemetry.io/collector/config/confighttp v0.83.0 go.opentelemetry.io/collector/config/configopaque v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 + go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/exporter v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 + go.uber.org/multierr v1.11.0 + go.uber.org/zap v1.25.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -40,7 +45,6 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect go.opentelemetry.io/collector/config/internal v0.83.0 // indirect - go.opentelemetry.io/collector/consumer v0.83.0 // indirect go.opentelemetry.io/collector/extension v0.83.0 // indirect go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect @@ -50,13 +54,10 @@ require ( go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.25.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 90ecb0a0df30..3b78fb234e4d 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -12,16 +12,29 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= +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.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= +github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= +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/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= +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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= +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/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= +github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -110,6 +123,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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= @@ -217,6 +231,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ= +github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= @@ -273,11 +289,13 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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= @@ -343,6 +361,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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= @@ -352,6 +371,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/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= @@ -370,6 +390,9 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -384,6 +407,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -414,16 +438,27 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-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.0.0-20220908164124-27713097b956/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.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/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.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -438,6 +473,7 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK 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.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= 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= diff --git a/exporter/opensearchexporter/integration_test.go b/exporter/opensearchexporter/integration_test.go new file mode 100644 index 000000000000..2354309f895b --- /dev/null +++ b/exporter/opensearchexporter/integration_test.go @@ -0,0 +1,176 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opensearchexporter + +import ( + "context" + "encoding/json" + "io" + "net/http" + "net/http/httptest" + "os" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/pdata/ptrace" + "gopkg.in/yaml.v3" +) + +func TestOpenSearchExporter(t *testing.T) { + type requestHandler struct { + ValidateReceivedDocuments func(*testing.T, int, []map[string]any) + ResponseJSONPath string + } + + checkAndRespond := func(responsePath string) requestHandler { + pass := func(t *testing.T, _ int, docs []map[string]any) { + for _, doc := range docs { + require.NotEmpty(t, doc) + } + } + return requestHandler{pass, responsePath} + } + tests := []struct { + Label string + TracePath string + RequestHandlers []requestHandler + ValidateExporterReturn func(error) + }{ + { + "Round trip", + "testdata/traces-sample-a.yaml", + []requestHandler{ + checkAndRespond("testdata/opensearch-response-no-error.json"), + }, + func(err error) { + require.NoError(t, err) + }, + }, + { + "Permanent error", + "testdata/traces-sample-a.yaml", + []requestHandler{ + checkAndRespond("testdata/opensearch-response-permanent-error.json"), + }, + func(err error) { + require.True(t, consumererror.IsPermanent(err)) + }, + }, + { + "Retryable error", + "testdata/traces-sample-a.yaml", + []requestHandler{ + checkAndRespond("testdata/opensearch-response-retryable-error.json"), + checkAndRespond("testdata/opensearch-response-retryable-succeeded.json"), + }, + func(err error) { + require.NoError(t, err) + }, + }, + + { + "Retryable error, succeeds on second try", + "testdata/traces-sample-a.yaml", + []requestHandler{ + checkAndRespond("testdata/opensearch-response-retryable-error.json"), + checkAndRespond("testdata/opensearch-response-retryable-error-2-attempt.json"), + checkAndRespond("testdata/opensearch-response-retryable-succeeded.json"), + }, + func(err error) { + require.NoError(t, err) + }, + }, + } + + getReceivedDocuments := func(body io.ReadCloser) []map[string]any { + var rtn []map[string]any + var err error + decoder := json.NewDecoder(body) + for decoder.More() { + var jsonData any + err = decoder.Decode(&jsonData) + require.NoError(t, err) + require.NotNil(t, jsonData) + + strMap := jsonData.(map[string]any) + if actionData, isBulkAction := strMap["create"]; isBulkAction { + validateBulkAction(t, actionData.(map[string]any)) + } else { + rtn = append(rtn, strMap) + } + } + return rtn + } + + for _, tc := range tests { + // Create HTTP listener + var requestCount = 0 + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + var err error + docs := getReceivedDocuments(r.Body) + require.LessOrEqualf(t, requestCount, len(tc.RequestHandlers), "Test case generated more requests than it has response for.") + tc.RequestHandlers[requestCount].ValidateReceivedDocuments(t, requestCount, docs) + + w.WriteHeader(200) + response, _ := os.ReadFile(tc.RequestHandlers[requestCount].ResponseJSONPath) + _, err = w.Write(response) + require.NoError(t, err) + + requestCount++ + })) + + cfg := withDefaultConfig(func(config *Config) { + config.Endpoint = ts.URL + config.TimeoutSettings.Timeout = 0 + }) + + // Create exporter + f := NewFactory() + exporter, err := f.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + + // Initialize the exporter + err = exporter.Start(context.Background(), componenttest.NewNopHost()) + require.NoError(t, err) + + // Load sample data + traces, err := readTraces(tc.TracePath) + require.NoError(t, err) + + // Send it + err = exporter.ConsumeTraces(context.Background(), traces) + tc.ValidateExporterReturn(err) + err = exporter.Shutdown(context.Background()) + require.NoError(t, err) + ts.Close() + } +} + +// validateBulkAction ensures the action JSON object is to the correct index. +func validateBulkAction(t *testing.T, strMap map[string]any) { + val, exists := strMap["_index"] + require.True(t, exists) + require.Equal(t, val, "ss4o_traces-default-namespace") +} + +// readTraces loads a yaml file at given filePath and converts the content to ptrace.Traces +func readTraces(filePath string) (ptrace.Traces, error) { + b, err := os.ReadFile(filePath) + if err != nil { + return ptrace.Traces{}, err + } + var m map[string]interface{} + if err = yaml.Unmarshal(b, &m); err != nil { + return ptrace.Traces{}, err + } + b, err = json.Marshal(m) + if err != nil { + return ptrace.Traces{}, err + } + unmarshaler := ptrace.JSONUnmarshaler{} + return unmarshaler.UnmarshalTraces(b) +} diff --git a/exporter/opensearchexporter/internal/metadata/generated_status.go b/exporter/opensearchexporter/internal/metadata/generated_status.go new file mode 100644 index 000000000000..5e3920c28434 --- /dev/null +++ b/exporter/opensearchexporter/internal/metadata/generated_status.go @@ -0,0 +1,12 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "go.opentelemetry.io/collector/component" +) + +const ( + Type = "opensearch" + TracesStability = component.StabilityLevelDevelopment +) diff --git a/exporter/opensearchexporter/logger.go b/exporter/opensearchexporter/logger.go new file mode 100644 index 000000000000..f25d4d26adc5 --- /dev/null +++ b/exporter/opensearchexporter/logger.go @@ -0,0 +1,56 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +// Package opensearchexporter contains an opentelemetry-collector exporter +// for OpenSearch. +package opensearchexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter" + +import ( + "net/http" + "time" + + "github.com/opensearch-project/opensearch-go/v2/opensearchtransport" + "go.uber.org/zap" +) + +type clientLogger struct { + zapLogger *zap.Logger +} + +func newClientLogger(zl *zap.Logger) opensearchtransport.Logger { + return &clientLogger{zl} +} + +// LogRoundTrip should not modify the request or response, except for consuming and closing the body. +// Implementations have to check for nil values in request and response. +func (cl *clientLogger) LogRoundTrip(requ *http.Request, resp *http.Response, err error, _ time.Time, dur time.Duration) error { + switch { + case err == nil && resp != nil: + cl.zapLogger.Debug("Request roundtrip completed.", + zap.String("path", requ.URL.Path), + zap.String("method", requ.Method), + zap.Duration("duration", dur), + zap.String("status", resp.Status)) + + case err != nil: + cl.zapLogger.Error("Request failed.", + zap.String("path", requ.URL.Path), + zap.String("method", requ.Method), + zap.Duration("duration", dur), + zap.NamedError("reason", err)) + } + + return nil +} + +// RequestBodyEnabled makes the client pass a copy of request body to the logger. +func (*clientLogger) RequestBodyEnabled() bool { + // TODO: introduce setting log the bodies for more detailed debug logs + return false +} + +// ResponseBodyEnabled makes the client pass a copy of response body to the logger. +func (*clientLogger) ResponseBodyEnabled() bool { + // TODO: introduce setting log the bodies for more detailed debug logs + return false +} diff --git a/exporter/opensearchexporter/metadata.yaml b/exporter/opensearchexporter/metadata.yaml index 3adb26673a1d..da748b08060e 100644 --- a/exporter/opensearchexporter/metadata.yaml +++ b/exporter/opensearchexporter/metadata.yaml @@ -2,5 +2,7 @@ type: opensearch status: class: exporter + stability: + development: [traces] codeowners: active: [Aneurysm9, MitchellGale, MaxKsyunz, YANG-DB] \ No newline at end of file diff --git a/exporter/opensearchexporter/sso_model.go b/exporter/opensearchexporter/sso_model.go new file mode 100644 index 000000000000..002e9501ca25 --- /dev/null +++ b/exporter/opensearchexporter/sso_model.go @@ -0,0 +1,60 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opensearchexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter" + +import ( + "time" +) + +type dataStream struct { + Dataset string `json:"dataset,omitempty"` + Namespace string `json:"namespace,omitempty"` + Type string `json:"type,omitempty"` +} + +type ssoSpanEvent struct { + Attributes map[string]any `json:"attributes"` + DroppedAttributesCount uint32 `json:"droppedAttributesCount"` + Name string `json:"name"` + ObservedTimestamp *time.Time `json:"observedTimestamp,omitempty"` + Timestamp *time.Time `json:"@timestamp,omitempty"` +} + +type ssoSpanLinks struct { + Attributes map[string]any `json:"attributes,omitempty"` + SpanID string `json:"spanId,omitempty"` + TraceID string `json:"traceId,omitempty"` + TraceState string `json:"traceState,omitempty"` + DroppedAttributesCount uint32 `json:"droppedAttributesCount,omitempty"` +} + +type ssoSpan struct { + Attributes map[string]any `json:"attributes,omitempty"` + DroppedAttributesCount uint32 `json:"droppedAttributesCount"` + DroppedEventsCount uint32 `json:"droppedEventsCount"` + DroppedLinksCount uint32 `json:"droppedLinksCount"` + EndTime time.Time `json:"endTime"` + Events []ssoSpanEvent `json:"events,omitempty"` + InstrumentationScope struct { + Attributes map[string]any `json:"attributes,omitempty"` + DroppedAttributesCount uint32 `json:"droppedAttributesCount"` + Name string `json:"name"` + SchemaURL string `json:"schemaUrl"` + Version string `json:"version"` + } `json:"instrumentationScope,omitempty"` + Kind string `json:"kind"` + Links []ssoSpanLinks `json:"links,omitempty"` + Name string `json:"name"` + ParentSpanID string `json:"parentSpanId"` + Resource map[string]any `json:"resource,omitempty"` + SpanID string `json:"spanId"` + StartTime time.Time `json:"startTime"` + Status struct { + Code string `json:"code"` + Message string `json:"message"` + } `json:"status"` + Timestamp time.Time `json:"@timestamp"` + TraceID string `json:"traceId"` + TraceState string `json:"traceState"` +} diff --git a/exporter/opensearchexporter/sso_trace_exporter.go b/exporter/opensearchexporter/sso_trace_exporter.go new file mode 100644 index 000000000000..f279166955ac --- /dev/null +++ b/exporter/opensearchexporter/sso_trace_exporter.go @@ -0,0 +1,79 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opensearchexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter" + +import ( + "context" + "net/http" + + "github.com/opensearch-project/opensearch-go/v2" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/zap" +) + +type ssoTracesExporter struct { + client *opensearch.Client + Namespace string + Dataset string + httpSettings confighttp.HTTPClientSettings + telemetry component.TelemetrySettings +} + +func newSSOTracesExporter(cfg *Config, set exporter.CreateSettings) (*ssoTracesExporter, error) { + if err := cfg.Validate(); err != nil { + return nil, err + } + + return &ssoTracesExporter{ + telemetry: set.TelemetrySettings, + Namespace: cfg.Namespace, + Dataset: cfg.Dataset, + httpSettings: cfg.HTTPClientSettings, + }, nil +} + +func (s *ssoTracesExporter) Start(_ context.Context, host component.Host) error { + httpClient, err := s.httpSettings.ToClient(host, s.telemetry) + if err != nil { + return err + } + + client, err := newOpenSearchClient(s.httpSettings.Endpoint, httpClient, s.telemetry.Logger) + if err != nil { + return err + } + + s.client = client + return nil +} + +func (s *ssoTracesExporter) pushTraceData(ctx context.Context, td ptrace.Traces) error { + indexer := newTraceBulkIndexer(s.Dataset, s.Namespace) + startErr := indexer.start(s.client) + if startErr != nil { + return startErr + } + indexer.submit(ctx, td) + indexer.close(ctx) + return indexer.joinedError() +} + +func newOpenSearchClient(endpoint string, httpClient *http.Client, logger *zap.Logger) (*opensearch.Client, error) { + transport := httpClient.Transport + return opensearch.NewClient(opensearch.Config{ + Transport: transport, + + // configure connection setup + Addresses: []string{endpoint}, + DisableRetry: true, + + // configure internal metrics reporting and logging + EnableMetrics: false, // TODO + EnableDebugLogger: false, // TODO + Logger: newClientLogger(logger), + }) +} diff --git a/exporter/opensearchexporter/testdata/config.yaml b/exporter/opensearchexporter/testdata/config.yaml index 8cd10bb8f588..1e01a85980e4 100644 --- a/exporter/opensearchexporter/testdata/config.yaml +++ b/exporter/opensearchexporter/testdata/config.yaml @@ -4,19 +4,35 @@ extensions: password: testtoo opensearch: - endpoint: https://opensearch.example.com:9200 + http: + endpoint: https://opensearch.example.com:9200 + +opensearch/empty_namespace: + dataset: ngnix + namespace: "" + http: + endpoint: https://opensearch.example.com:9200 + +opensearch/empty_dataset: + dataset: "" + namespace: eu + http: + endpoint: https://opensearch.example.com:9200 + opensearch/trace: dataset: ngnix namespace: eu - tls: - insecure: false - endpoint: https://opensearch.example.com:9200 - timeout: 2m - headers: - myheader: test + http: + tls: + insecure: false + endpoint: https://opensearch.example.com:9200 + timeout: 2m + headers: + myheader: test + auth: + authenticator: sample_basic_auth + timeout: retry_on_failure: enabled: true initial_interval: 100000000 randomization_factor: 0.5 - auth: - authenticator: sample_basic_auth diff --git a/exporter/opensearchexporter/testdata/opensearch-response-no-error.json b/exporter/opensearchexporter/testdata/opensearch-response-no-error.json new file mode 100644 index 000000000000..7094ade610b7 --- /dev/null +++ b/exporter/opensearchexporter/testdata/opensearch-response-no-error.json @@ -0,0 +1,38 @@ +{ + "errors": false, + "items": [ + { + "index": { + "_id": "1rrTj4kB8NX1kNtrCB8U", + "_index": "ss4o_traces-default-namespace", + "_primary_term": 1, + "_seq_no": 0, + "_shards": { + "failed": 0, + "successful": 1, + "total": 2 + }, + "_version": 1, + "result": "created", + "status": 201 + } + }, + { + "index": { + "_id": "2arTj4kB8NX1kNtrCB8U", + "_index": "ss4o_traces-default-namespace", + "_primary_term": 1, + "_seq_no": 0, + "_shards": { + "failed": 0, + "successful": 1, + "total": 2 + }, + "_version": 1, + "result": "created", + "status": 201 + } + } + ], + "took": 65 +} \ No newline at end of file diff --git a/exporter/opensearchexporter/testdata/opensearch-response-permanent-error.json b/exporter/opensearchexporter/testdata/opensearch-response-permanent-error.json new file mode 100644 index 000000000000..3e89418ad02a --- /dev/null +++ b/exporter/opensearchexporter/testdata/opensearch-response-permanent-error.json @@ -0,0 +1,37 @@ +{ + "errors": true, + "items": [ + { + "index": { + "_id": "2LrYj4kB8NX1kNtroB9F", + "_index": "ss4o_traces-default-namespace", + "_primary_term": 1, + "_seq_no": 2, + "_shards": { + "failed": 0, + "successful": 1, + "total": 2 + }, + "_version": 1, + "result": "created", + "status": 201 + } + }, + { + "index": { + "_id": "2brYj4kB8NX1kNtroB9F", + "_index": "ss4o_traces-default-namespace", + "error": { + "caused_by": { + "reason": "For input string: \"rew\"", + "type": "number_format_exception" + }, + "reason": "failed to parse field [kind] of type [integer] in document with id '2brYj4kB8NX1kNtroB9F'. Preview of field's value: 'rew'", + "type": "mapper_parsing_exception" + }, + "status": 400 + } + } + ], + "took": 43 +} \ No newline at end of file diff --git a/exporter/opensearchexporter/testdata/opensearch-response-retryable-error-2-attempt.json b/exporter/opensearchexporter/testdata/opensearch-response-retryable-error-2-attempt.json new file mode 100644 index 000000000000..94ca95657ccb --- /dev/null +++ b/exporter/opensearchexporter/testdata/opensearch-response-retryable-error-2-attempt.json @@ -0,0 +1,21 @@ +{ + "errors": true, + "items": [ + { + "index": { + "_id": "2brYj4kB8NX1kNtroB9F", + "_index": "ss4o_traces-default-namespace", + "error": { + "caused_by": { + "reason": "Failed to execute global aggregators", + "type": "query_phase_execution_exception" + }, + "reason": "failed to parse field [kind] of type [integer] in document with id '2brYj4kB8NX1kNtroB9F'. Preview of field's value: 'rew'", + "type": "mapper_parsing_exception" + }, + "status": 500 + } + } + ], + "took": 43 +} \ No newline at end of file diff --git a/exporter/opensearchexporter/testdata/opensearch-response-retryable-error.json b/exporter/opensearchexporter/testdata/opensearch-response-retryable-error.json new file mode 100644 index 000000000000..254f0d518510 --- /dev/null +++ b/exporter/opensearchexporter/testdata/opensearch-response-retryable-error.json @@ -0,0 +1,37 @@ +{ + "errors": true, + "items": [ + { + "index": { + "_id": "2LrYj4kB8NX1kNtroB9F", + "_index": "ss4o_traces-default-namespace", + "_primary_term": 1, + "_seq_no": 2, + "_shards": { + "failed": 0, + "successful": 1, + "total": 2 + }, + "_version": 1, + "result": "created", + "status": 201 + } + }, + { + "index": { + "_id": "2brYj4kB8NX1kNtroB9F", + "_index": "ss4o_traces-default-namespace", + "error": { + "caused_by": { + "reason": "Failed to execute global aggregators", + "type": "query_phase_execution_exception" + }, + "reason": "failed to parse field [kind] of type [integer] in document with id '2brYj4kB8NX1kNtroB9F'. Preview of field's value: 'rew'", + "type": "mapper_parsing_exception" + }, + "status": 500 + } + } + ], + "took": 43 +} \ No newline at end of file diff --git a/exporter/opensearchexporter/testdata/opensearch-response-retryable-succeeded.json b/exporter/opensearchexporter/testdata/opensearch-response-retryable-succeeded.json new file mode 100644 index 000000000000..8eb18b757d69 --- /dev/null +++ b/exporter/opensearchexporter/testdata/opensearch-response-retryable-succeeded.json @@ -0,0 +1,21 @@ +{ + "errors": false, + "items": [ + { + "index": { + "_id": "1rrTj4kB8NX1kNtrCB8U", + "_index": "ss4o_traces-default-namespace", + "_primary_term": 1, + "_seq_no": 0, + "_shards": { + "failed": 0, + "successful": 1, + "total": 2 + }, + "_version": 1, + "result": "created", + "status": 201 + } + } + ] +} \ No newline at end of file diff --git a/exporter/opensearchexporter/testdata/traces-sample-a.yaml b/exporter/opensearchexporter/testdata/traces-sample-a.yaml new file mode 100644 index 000000000000..01440ae77896 --- /dev/null +++ b/exporter/opensearchexporter/testdata/traces-sample-a.yaml @@ -0,0 +1,63 @@ +resourceSpans: + - resource: + attributes: + - key: host.name + value: + stringValue: host2 + scopeSpans: + - scope: + name: collector + version: v0.1.0 + spans: + - attributes: + - key: testKey3 + value: + stringValue: teststringvalue3 + - key: testKey4 + value: + stringValue: teststringvalue4 + endTimeUnixNano: "11651379494838206464" + kind: 2 + parentSpanId: "" + spanId: "" + startTimeUnixNano: "11651379494838206464" + status: {} + traceId: "" + - resource: + attributes: + - key: host.name + value: + stringValue: host1 + scopeSpans: + - schemaUrl: https://opentelemetry.io/schemas/1.6.1 + scope: + name: collector + version: v0.1.0 + spans: + - attributes: + - key: testKey1 + value: + stringValue: teststringvalue1 + - key: testKey2 + value: + stringValue: teststringvalue2 + endTimeUnixNano: "11651379494838206464" + events: + - name: Sub span event + kind: 2 + links: + - attributes: + - key: testKey1 + value: + stringValue: teststringvalue1 + - key: testKey2 + value: + stringValue: teststringvalue2 + spanId: fd0da883bb27cd6b + traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 + name: span1 + parentSpanId: bcff497b5a47310f + spanId: fd0da883bb27cd6b + startTimeUnixNano: "11651379494838206464" + status: {} + traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5 diff --git a/exporter/opensearchexporter/trace_bulk_indexer.go b/exporter/opensearchexporter/trace_bulk_indexer.go new file mode 100644 index 000000000000..e3eb7d66e97a --- /dev/null +++ b/exporter/opensearchexporter/trace_bulk_indexer.go @@ -0,0 +1,241 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opensearchexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter" + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "strings" + "time" + + "github.com/opensearch-project/opensearch-go/v2" + "github.com/opensearch-project/opensearch-go/v2/opensearchutil" + "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.uber.org/multierr" +) + +type traceBulkIndexer struct { + dataset string + namespace string + errs []error + bulkIndexer opensearchutil.BulkIndexer +} + +func newTraceBulkIndexer(dataset string, namespace string) *traceBulkIndexer { + return &traceBulkIndexer{dataset, namespace, nil, nil} +} + +func (tbi *traceBulkIndexer) joinedError() error { + return multierr.Combine(tbi.errs...) +} + +func (tbi *traceBulkIndexer) start(client *opensearch.Client) error { + var startErr error + tbi.bulkIndexer, startErr = newOpenSearchBulkIndexer(client, tbi.onIndexerError) + return startErr +} + +func (tbi *traceBulkIndexer) close(ctx context.Context) { + closeErr := tbi.bulkIndexer.Close(ctx) + if closeErr != nil { + tbi.errs = append(tbi.errs, closeErr) + } +} + +func (tbi *traceBulkIndexer) onIndexerError(_ context.Context, indexerErr error) { + if indexerErr != nil { + tbi.appendPermanentError(consumererror.NewPermanent(indexerErr)) + } +} + +func (tbi *traceBulkIndexer) appendPermanentError(e error) { + tbi.errs = append(tbi.errs, consumererror.NewPermanent(e)) +} + +func (tbi *traceBulkIndexer) appendRetryTraceError(err error, trace ptrace.Traces) { + tbi.errs = append(tbi.errs, consumererror.NewTraces(err, trace)) +} + +func (tbi *traceBulkIndexer) submit(ctx context.Context, td ptrace.Traces) { + forEachSpan(td, func(resource pcommon.Resource, resourceSchemaURL string, scope pcommon.InstrumentationScope, scopeSchemaURL string, span ptrace.Span) { + payload, err := tbi.createJSON(resource, scope, scopeSchemaURL, span) + if err != nil { + tbi.appendPermanentError(err) + } else { + ItemFailureHandler := func(ctx context.Context, item opensearchutil.BulkIndexerItem, resp opensearchutil.BulkIndexerResponseItem, itemErr error) { + // Setup error handler. The handler handles the per item response status based on the + // selective ACKing in the bulk response. + tbi.processItemFailure(resp, itemErr, makeTrace(resource, resourceSchemaURL, scope, scopeSchemaURL, span)) + } + bi := tbi.newBulkIndexerItem(payload) + bi.OnFailure = ItemFailureHandler + err = tbi.bulkIndexer.Add(ctx, bi) + if err != nil { + tbi.appendRetryTraceError(err, makeTrace(resource, resourceSchemaURL, scope, scopeSchemaURL, span)) + } + } + }) +} + +func makeTrace(resource pcommon.Resource, resourceSchemaURL string, scope pcommon.InstrumentationScope, scopeSchemaURL string, span ptrace.Span) ptrace.Traces { + traces := ptrace.NewTraces() + rs := traces.ResourceSpans().AppendEmpty() + resource.CopyTo(rs.Resource()) + rs.SetSchemaUrl(resourceSchemaURL) + ss := rs.ScopeSpans().AppendEmpty() + + ss.SetSchemaUrl(scopeSchemaURL) + scope.CopyTo(ss.Scope()) + s := ss.Spans().AppendEmpty() + + span.CopyTo(s) + + return traces +} + +func (tbi *traceBulkIndexer) createJSON( + resource pcommon.Resource, + scope pcommon.InstrumentationScope, + schemaURL string, + span ptrace.Span, +) ([]byte, error) { + sso := ssoSpan{} + sso.Attributes = span.Attributes().AsRaw() + sso.DroppedAttributesCount = span.DroppedAttributesCount() + sso.DroppedEventsCount = span.DroppedEventsCount() + sso.DroppedLinksCount = span.DroppedLinksCount() + sso.EndTime = span.EndTimestamp().AsTime() + sso.Kind = span.Kind().String() + sso.Name = span.Name() + sso.ParentSpanID = span.ParentSpanID().String() + sso.Resource = resource.Attributes().AsRaw() + sso.SpanID = span.SpanID().String() + sso.StartTime = span.StartTimestamp().AsTime() + sso.Status.Code = span.Status().Code().String() + sso.Status.Message = span.Status().Message() + sso.TraceID = span.TraceID().String() + sso.TraceState = span.TraceState().AsRaw() + + if span.Events().Len() > 0 { + sso.Events = make([]ssoSpanEvent, span.Events().Len()) + for i := 0; i < span.Events().Len(); i++ { + e := span.Events().At(i) + ssoEvent := &sso.Events[i] + ssoEvent.Attributes = e.Attributes().AsRaw() + ssoEvent.DroppedAttributesCount = e.DroppedAttributesCount() + ssoEvent.Name = e.Name() + ts := e.Timestamp().AsTime() + if ts.Unix() != 0 { + ssoEvent.Timestamp = &ts + } else { + now := time.Now() + ssoEvent.ObservedTimestamp = &now + } + } + } + + ds := dataStream{} + if tbi.dataset != "" { + ds.Dataset = tbi.dataset + } + + if tbi.namespace != "" { + ds.Namespace = tbi.namespace + } + + if ds != (dataStream{}) { + ds.Type = "span" + sso.Attributes["data_stream"] = ds + } + + sso.InstrumentationScope.Name = scope.Name() + sso.InstrumentationScope.DroppedAttributesCount = scope.DroppedAttributesCount() + sso.InstrumentationScope.Version = scope.Version() + sso.InstrumentationScope.SchemaURL = schemaURL + sso.InstrumentationScope.Attributes = scope.Attributes().AsRaw() + + if span.Links().Len() > 0 { + sso.Links = make([]ssoSpanLinks, span.Links().Len()) + for i := 0; i < span.Links().Len(); i++ { + link := span.Links().At(i) + ssoLink := &sso.Links[i] + ssoLink.Attributes = link.Attributes().AsRaw() + ssoLink.DroppedAttributesCount = link.DroppedAttributesCount() + ssoLink.TraceID = link.TraceID().String() + ssoLink.TraceState = link.TraceState().AsRaw() + ssoLink.SpanID = link.SpanID().String() + } + } + return json.Marshal(sso) +} + +func (tbi *traceBulkIndexer) processItemFailure(resp opensearchutil.BulkIndexerResponseItem, itemErr error, traces ptrace.Traces) { + switch { + case shouldRetryEvent(resp.Status): + // Recoverable OpenSearch error + tbi.appendRetryTraceError(responseAsError(resp), traces) + case resp.Status != 0 && itemErr == nil: + // Non-recoverable OpenSearch error while indexing document + tbi.appendPermanentError(responseAsError(resp)) + default: + // Encoding error. We didn't even attempt to send the event + tbi.appendPermanentError(itemErr) + } +} + +// responseAsError converts an opensearchutil.BulkIndexerResponseItem.Error into an error +func responseAsError(item opensearchutil.BulkIndexerResponseItem) error { + errorJSON, _ := json.Marshal(item.Error) + return errors.New(string(errorJSON)) +} + +func shouldRetryEvent(status int) bool { + var retryOnStatus = []int{500, 502, 503, 504, 429} + for _, retryable := range retryOnStatus { + if status == retryable { + return true + } + } + return false +} + +func (tbi *traceBulkIndexer) newBulkIndexerItem(document []byte) opensearchutil.BulkIndexerItem { + body := bytes.NewReader(document) + item := opensearchutil.BulkIndexerItem{Action: "create", Index: tbi.getIndexName(), Body: body} + return item +} + +func (tbi *traceBulkIndexer) getIndexName() string { + return strings.Join([]string{"ss4o_traces", tbi.dataset, tbi.namespace}, "-") +} + +func newOpenSearchBulkIndexer(client *opensearch.Client, onIndexerError func(context.Context, error)) (opensearchutil.BulkIndexer, error) { + return opensearchutil.NewBulkIndexer(opensearchutil.BulkIndexerConfig{ + NumWorkers: 1, + Client: client, + OnError: onIndexerError, + }) +} + +func forEachSpan(td ptrace.Traces, visitor func(pcommon.Resource, string, pcommon.InstrumentationScope, string, ptrace.Span)) { + resourceSpans := td.ResourceSpans() + for i := 0; i < resourceSpans.Len(); i++ { + il := resourceSpans.At(i) + resource := il.Resource() + scopeSpans := il.ScopeSpans() + for j := 0; j < scopeSpans.Len(); j++ { + scopeSpan := scopeSpans.At(j) + spans := scopeSpans.At(j).Spans() + + for k := 0; k < spans.Len(); k++ { + span := spans.At(k) + visitor(resource, il.SchemaUrl(), scopeSpan.Scope(), scopeSpan.SchemaUrl(), span) + } + } + } +} diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index c4761f020434..a453b1f7a0de 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -39,7 +39,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // 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 @@ -75,8 +75,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -161,7 +161,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/api v0.136.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index a13c2b93e94b..4b095b370eaf 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -80,8 +80,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.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -283,11 +283,11 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -940,7 +940,7 @@ 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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= 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= @@ -957,8 +957,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/exporter/prometheusremotewriteexporter/helper.go b/exporter/prometheusremotewriteexporter/helper.go index 2f84d5617191..b468609380c8 100644 --- a/exporter/prometheusremotewriteexporter/helper.go +++ b/exporter/prometheusremotewriteexporter/helper.go @@ -16,10 +16,11 @@ func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int) return nil, errors.New("invalid tsMap: cannot be empty map") } - var requests []*prompb.WriteRequest - var tsArray []prompb.TimeSeries + requests := make([]*prompb.WriteRequest, 0, len(tsMap)) + tsArray := make([]prompb.TimeSeries, 0, len(tsMap)) sizeOfCurrentBatch := 0 + i := 0 for _, v := range tsMap { sizeOfSeries := v.Size() @@ -27,12 +28,13 @@ func batchTimeSeries(tsMap map[string]*prompb.TimeSeries, maxBatchByteSize int) wrapped := convertTimeseriesToRequest(tsArray) requests = append(requests, wrapped) - tsArray = nil + tsArray = make([]prompb.TimeSeries, 0, len(tsMap)-i) sizeOfCurrentBatch = 0 } tsArray = append(tsArray, *v) sizeOfCurrentBatch += sizeOfSeries + i++ } if len(tsArray) != 0 { diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index ec0fed0ec29c..1866732c5f60 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -223,7 +223,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= diff --git a/exporter/signalfxexporter/README.md b/exporter/signalfxexporter/README.md index c2a4934e7ca9..35c60c859c27 100644 --- a/exporter/signalfxexporter/README.md +++ b/exporter/signalfxexporter/README.md @@ -140,7 +140,7 @@ will be replaced with a `_`. api_tls: ca_file: "/etc/opt/certs/ca.pem" ``` - +- `drop_histogram_buckets`: (default = `false`) if set to true, histogram buckets will not be translated into datapoints with `_bucket` suffix but will be dropped instead, only datapoints with `_sum`, `_count`, `_min` (optional) and `_max` (optional) suffixes will be sent. In addition, this exporter offers queued retry which is enabled by default. Information about queued retry configuration parameters can be found [here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md). diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index 0af44a898d55..d75aa6d174fa 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -133,6 +133,10 @@ type Config struct { // MaxConnections is used to set a limit to the maximum idle HTTP connection the exporter can keep open. // Deprecated: use HTTPClientSettings.MaxIdleConns or HTTPClientSettings.MaxIdleConnsPerHost instead. MaxConnections int `mapstructure:"max_connections"` + + // Whether to drop histogram bucket metrics dispatched to Splunk Observability. + // Default value is set to false. + DropHistogramBuckets bool `mapstructure:"drop_histogram_buckets"` } type DimensionClientConfig struct { diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index 48b1c2735a96..8f5425993a49 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -83,6 +83,7 @@ func newSignalFxExporter( config.ExcludeMetrics, config.IncludeMetrics, config.NonAlphanumericDimensionChars, + config.DropHistogramBuckets, ) if err != nil { return nil, fmt.Errorf("failed to create metric converter: %w", err) diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 661b41cbc687..50820d63eebd 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -189,7 +189,7 @@ func TestConsumeMetrics(t *testing.T) { client, err := cfg.ToClient(componenttest.NewNopHost(), exportertest.NewNopCreateSettings().TelemetrySettings) require.NoError(t, err) - c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "") + c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "", false) require.NoError(t, err) require.NotNil(t, c) dpClient := &sfxDPClient{ @@ -729,6 +729,7 @@ func TestConsumeMetadata(t *testing.T) { cfg.ExcludeMetrics, cfg.IncludeMetrics, cfg.NonAlphanumericDimensionChars, + false, ) require.NoError(t, err) type args struct { @@ -1088,7 +1089,7 @@ func BenchmarkExporterConsumeData(b *testing.B) { serverURL, err := url.Parse(server.URL) assert.NoError(b, err) - c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "") + c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "", false) require.NoError(b, err) require.NotNil(b, c) dpClient := &sfxDPClient{ @@ -1281,7 +1282,7 @@ func TestTLSIngestConnection(t *testing.T) { func TestDefaultSystemCPUTimeExcludedAndTranslated(t *testing.T) { translator, err := translation.NewMetricTranslator(defaultTranslationRules, 3600) require.NoError(t, err) - converter, err := translation.NewMetricsConverter(zap.NewNop(), translator, defaultExcludeMetrics, nil, "_-.") + converter, err := translation.NewMetricsConverter(zap.NewNop(), translator, defaultExcludeMetrics, nil, "_-.", false) require.NoError(t, err) md := pmetric.NewMetrics() @@ -1324,7 +1325,7 @@ func TestTLSAPIConnection(t *testing.T) { cfg.ExcludeMetrics, cfg.IncludeMetrics, cfg.NonAlphanumericDimensionChars, - ) + false) require.NoError(t, err) metadata := []*metadata.MetadataUpdate{ diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index d51dbd1fbf42..5db2e73969e2 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -123,7 +123,7 @@ func TestDefaultTranslationRules(t *testing.T) { require.NoError(t, err) data := testMetricsData() - c, err := translation.NewMetricsConverter(zap.NewNop(), tr, nil, nil, "") + c, err := translation.NewMetricsConverter(zap.NewNop(), tr, nil, nil, "", false) require.NoError(t, err) translated := c.MetricsToSignalFxV2(data) require.NotNil(t, translated) @@ -493,7 +493,7 @@ func TestHostmetricsCPUTranslations(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) require.NoError(t, setDefaultExcludes(cfg)) - converter, err := translation.NewMetricsConverter(zap.NewNop(), testGetTranslator(t), cfg.ExcludeMetrics, cfg.IncludeMetrics, "") + converter, err := translation.NewMetricsConverter(zap.NewNop(), testGetTranslator(t), cfg.ExcludeMetrics, cfg.IncludeMetrics, "", false) require.NoError(t, err) md1, err := golden.ReadMetrics(filepath.Join("testdata", "hostmetrics_system_cpu_time_1.yaml")) @@ -534,7 +534,7 @@ func TestDefaultExcludesTranslated(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) require.NoError(t, setDefaultExcludes(cfg)) - converter, err := translation.NewMetricsConverter(zap.NewNop(), testGetTranslator(t), cfg.ExcludeMetrics, cfg.IncludeMetrics, "") + converter, err := translation.NewMetricsConverter(zap.NewNop(), testGetTranslator(t), cfg.ExcludeMetrics, cfg.IncludeMetrics, "", false) require.NoError(t, err) var metrics []map[string]string @@ -557,7 +557,7 @@ func TestDefaultExcludes_not_translated(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) require.NoError(t, setDefaultExcludes(cfg)) - converter, err := translation.NewMetricsConverter(zap.NewNop(), nil, cfg.ExcludeMetrics, cfg.IncludeMetrics, "") + converter, err := translation.NewMetricsConverter(zap.NewNop(), nil, cfg.ExcludeMetrics, cfg.IncludeMetrics, "", false) require.NoError(t, err) var metrics []map[string]string @@ -577,7 +577,7 @@ func BenchmarkMetricConversion(b *testing.B) { tr, err := translation.NewMetricTranslator(rules, 1) require.NoError(b, err) - c, err := translation.NewMetricsConverter(zap.NewNop(), tr, nil, nil, "") + c, err := translation.NewMetricsConverter(zap.NewNop(), tr, nil, nil, "", false) require.NoError(b, err) bytes, err := os.ReadFile("testdata/json/hostmetrics.json") diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index f101d18730bc..958917f73744 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -32,6 +32,7 @@ require ( ) require ( + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -55,6 +56,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index da0df4d15a4f..6e07ec2ea7f3 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -807,7 +807,6 @@ github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -1458,6 +1457,7 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/exporter/signalfxexporter/internal/dimensions/metadata_test.go b/exporter/signalfxexporter/internal/dimensions/metadata_test.go index 3526eed61341..fc938a481a4b 100644 --- a/exporter/signalfxexporter/internal/dimensions/metadata_test.go +++ b/exporter/signalfxexporter/internal/dimensions/metadata_test.go @@ -204,6 +204,7 @@ func TestGetDimensionUpdateFromMetadata(t *testing.T) { nil, nil, "-_.", + false, ) require.NoError(t, err) assert.Equal(t, tt.want, getDimensionUpdateFromMetadata(tt.args.metadata, *converter)) diff --git a/exporter/signalfxexporter/internal/translation/converter.go b/exporter/signalfxexporter/internal/translation/converter.go index 850f3f6e30c7..1e7646b877d2 100644 --- a/exporter/signalfxexporter/internal/translation/converter.go +++ b/exporter/signalfxexporter/internal/translation/converter.go @@ -32,11 +32,12 @@ var ( // MetricsConverter converts MetricsData to sfxpb DataPoints. It holds an optional // MetricTranslator to translate SFx metrics using translation rules. type MetricsConverter struct { - logger *zap.Logger - metricTranslator *MetricTranslator - filterSet *dpfilters.FilterSet - datapointValidator *datapointValidator - translator *signalfx.FromTranslator + logger *zap.Logger + metricTranslator *MetricTranslator + filterSet *dpfilters.FilterSet + datapointValidator *datapointValidator + translator *signalfx.FromTranslator + dropHistogramBuckets bool } // NewMetricsConverter creates a MetricsConverter from the passed in logger and @@ -47,17 +48,19 @@ func NewMetricsConverter( t *MetricTranslator, excludes []dpfilters.MetricFilter, includes []dpfilters.MetricFilter, - nonAlphanumericDimChars string) (*MetricsConverter, error) { + nonAlphanumericDimChars string, + dropHistogramBuckets bool) (*MetricsConverter, error) { fs, err := dpfilters.NewFilterSet(excludes, includes) if err != nil { return nil, err } return &MetricsConverter{ - logger: logger, - metricTranslator: t, - filterSet: fs, - datapointValidator: newDatapointValidator(logger, nonAlphanumericDimChars), - translator: &signalfx.FromTranslator{}, + logger: logger, + metricTranslator: t, + filterSet: fs, + datapointValidator: newDatapointValidator(logger, nonAlphanumericDimChars), + translator: &signalfx.FromTranslator{}, + dropHistogramBuckets: dropHistogramBuckets, }, nil } @@ -66,7 +69,6 @@ func NewMetricsConverter( // dropped because of errors or warnings. func (c *MetricsConverter) MetricsToSignalFxV2(md pmetric.Metrics) []*sfxpb.DataPoint { var sfxDataPoints []*sfxpb.DataPoint - rms := md.ResourceMetrics() for i := 0; i < rms.Len(); i++ { rm := rms.At(i) @@ -75,9 +77,9 @@ func (c *MetricsConverter) MetricsToSignalFxV2(md pmetric.Metrics) []*sfxpb.Data for j := 0; j < rm.ScopeMetrics().Len(); j++ { ilm := rm.ScopeMetrics().At(j) var initialDps []*sfxpb.DataPoint - for k := 0; k < ilm.Metrics().Len(); k++ { - dps := c.translator.FromMetric(ilm.Metrics().At(k), extraDimensions) + currentMetric := ilm.Metrics().At(k) + dps := c.translator.FromMetric(currentMetric, extraDimensions, c.dropHistogramBuckets) initialDps = append(initialDps, dps...) } diff --git a/exporter/signalfxexporter/internal/translation/converter_test.go b/exporter/signalfxexporter/internal/translation/converter_test.go index e43f9cabe60a..90f8db83d5d6 100644 --- a/exporter/signalfxexporter/internal/translation/converter_test.go +++ b/exporter/signalfxexporter/internal/translation/converter_test.go @@ -44,27 +44,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { "k1": "v1", } - labelMapBucket1 := map[string]interface{}{ - "k0": "v0", - "k1": "v1", - "le": "1", - } - labelMapBucket2 := map[string]interface{}{ - "k0": "v0", - "k1": "v1", - "le": "2", - } - labelMapBucket3 := map[string]interface{}{ - "k0": "v0", - "k1": "v1", - "le": "4", - } - labelMapBucket4 := map[string]interface{}{ - "k0": "v0", - "k1": "v1", - "le": "+Inf", - } - longLabelMap := map[string]interface{}{ fmt.Sprintf("l%sng_key", strings.Repeat("o", 128)): "v0", "k0": "v0", @@ -108,31 +87,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { assert.NoError(t, int64PtWithLabels.Attributes().FromRaw(labelMap)) } - initHistDP := func(histDP pmetric.HistogramDataPoint) { - histDP.SetTimestamp(ts) - histDP.SetCount(uint64(int64Val)) - histDP.SetSum(doubleVal) - histDP.ExplicitBounds().FromRaw([]float64{1, 2, 4}) - histDP.BucketCounts().FromRaw([]uint64{4, 2, 3, 7}) - assert.NoError(t, histDP.Attributes().FromRaw(labelMap)) - } - histDP := pmetric.NewHistogramDataPoint() - initHistDP(histDP) - - initHistDPNoBuckets := func(histDP pmetric.HistogramDataPoint) { - histDP.SetCount(uint64(int64Val)) - histDP.SetSum(doubleVal) - histDP.SetTimestamp(ts) - assert.NoError(t, histDP.Attributes().FromRaw(labelMap)) - } - histDPNoBuckets := pmetric.NewHistogramDataPoint() - initHistDPNoBuckets(histDPNoBuckets) - - initHistPt := func(histDP pmetric.HistogramDataPoint) { - histDP.SetCount(uint64(int64Val)) - histDP.SetTimestamp(ts) - } - tests := []struct { name string metricsFn func() pmetric.Metrics @@ -196,11 +150,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetEmptySum().SetIsMonotonic(false) initInt64Pt(m.Sum().DataPoints().AppendEmpty()) } - { - m := ilm.Metrics().AppendEmpty() - m.SetName("histo_empty_metric") - initHistPt(m.SetEmptyHistogram().DataPoints().AppendEmpty()) - } return out }, wantSfxDataPoints: []*sfxpb.DataPoint{ @@ -212,7 +161,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { int64SFxDataPoint("delta_int_with_dims", &sfxMetricTypeCounter, nil), doubleSFxDataPoint("gauge_sum_double_with_dims", &sfxMetricTypeGauge, nil), int64SFxDataPoint("gauge_sum_int_with_dims", &sfxMetricTypeGauge, nil), - int64SFxDataPoint("histo_empty_metric_count", &sfxMetricTypeCumulativeCounter, nil), }, }, { @@ -243,16 +191,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetEmptySum().SetIsMonotonic(true) initInt64PtWithLabels(m.Sum().DataPoints().AppendEmpty()) } - { - m := ilm.Metrics().AppendEmpty() - m.SetName("histo_with_no_buckets_dims") - initHistDPNoBuckets(m.SetEmptyHistogram().DataPoints().AppendEmpty()) - } - { - m := ilm.Metrics().AppendEmpty() - m.SetName("histo_with_buckets_dims") - initHistDP(m.SetEmptyHistogram().DataPoints().AppendEmpty()) - } return out }, @@ -261,14 +199,6 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { int64SFxDataPoint("gauge_int_with_dims", &sfxMetricTypeGauge, labelMap), doubleSFxDataPoint("cumulative_double_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), int64SFxDataPoint("cumulative_int_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), - int64SFxDataPoint("histo_with_no_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), - doubleSFxDataPoint("histo_with_no_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), - int64SFxDataPoint("histo_with_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), - doubleSFxDataPoint("histo_with_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), - histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket1), 4), - histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket2), 6), - histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket3), 9), - histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket4), 16), }, }, { @@ -673,7 +603,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - c, err := NewMetricsConverter(logger, nil, tt.excludeMetrics, tt.includeMetrics, "") + c, err := NewMetricsConverter(logger, nil, tt.excludeMetrics, tt.includeMetrics, "", true) require.NoError(t, err) md := tt.metricsFn() gotSfxDataPoints := c.MetricsToSignalFxV2(md) @@ -686,6 +616,386 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { } } +func Test_MetricDataToSignalFxV2WithHistogramBuckets(t *testing.T) { + logger := zap.NewNop() + + labelMap := map[string]interface{}{ + "k0": "v0", + "k1": "v1", + } + + labelMapBucket1 := map[string]interface{}{ + "k0": "v0", + "k1": "v1", + "le": "1", + } + labelMapBucket2 := map[string]interface{}{ + "k0": "v0", + "k1": "v1", + "le": "2", + } + labelMapBucket3 := map[string]interface{}{ + "k0": "v0", + "k1": "v1", + "le": "4", + } + labelMapBucket4 := map[string]interface{}{ + "k0": "v0", + "k1": "v1", + "le": "+Inf", + } + + ts := pcommon.NewTimestampFromTime(time.Unix(unixSecs, unixNSecs)) + + initDoublePt := func(doublePt pmetric.NumberDataPoint) { + doublePt.SetTimestamp(ts) + doublePt.SetDoubleValue(doubleVal) + } + + initDoublePtWithLabels := func(doublePtWithLabels pmetric.NumberDataPoint) { + initDoublePt(doublePtWithLabels) + assert.NoError(t, doublePtWithLabels.Attributes().FromRaw(labelMap)) + } + initInt64Pt := func(int64Pt pmetric.NumberDataPoint) { + int64Pt.SetTimestamp(ts) + int64Pt.SetIntValue(int64Val) + } + + initInt64PtWithLabels := func(int64PtWithLabels pmetric.NumberDataPoint) { + initInt64Pt(int64PtWithLabels) + assert.NoError(t, int64PtWithLabels.Attributes().FromRaw(labelMap)) + } + + initHistDP := func(histDP pmetric.HistogramDataPoint) { + histDP.SetTimestamp(ts) + histDP.SetCount(uint64(int64Val)) + histDP.SetSum(doubleVal) + histDP.ExplicitBounds().FromRaw([]float64{1, 2, 4}) + histDP.BucketCounts().FromRaw([]uint64{4, 2, 3, 7}) + assert.NoError(t, histDP.Attributes().FromRaw(labelMap)) + } + histDP := pmetric.NewHistogramDataPoint() + initHistDP(histDP) + + initHistDPNoBuckets := func(histDP pmetric.HistogramDataPoint) { + histDP.SetCount(uint64(int64Val)) + histDP.SetSum(doubleVal) + histDP.SetTimestamp(ts) + assert.NoError(t, histDP.Attributes().FromRaw(labelMap)) + } + histDPNoBuckets := pmetric.NewHistogramDataPoint() + initHistDPNoBuckets(histDPNoBuckets) + + initHistPt := func(histDP pmetric.HistogramDataPoint) { + histDP.SetCount(uint64(int64Val)) + histDP.SetTimestamp(ts) + } + + tests := []struct { + name string + metricsFn func() pmetric.Metrics + excludeMetrics []dpfilters.MetricFilter + includeMetrics []dpfilters.MetricFilter + wantSfxDataPoints []*sfxpb.DataPoint + }{ + { + name: "nil_node_nil_resources_no_dims", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_double_with_dims") + initDoublePt(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_int_with_dims") + initInt64Pt(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("delta_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("delta_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_sum_double_with_dims") + m.SetEmptySum().SetIsMonotonic(false) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_sum_int_with_dims") + m.SetEmptySum().SetIsMonotonic(false) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_empty_metric") + initHistPt(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + doubleSFxDataPoint("gauge_double_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("gauge_int_with_dims", &sfxMetricTypeGauge, nil), + doubleSFxDataPoint("cumulative_double_with_dims", &sfxMetricTypeCumulativeCounter, nil), + int64SFxDataPoint("cumulative_int_with_dims", &sfxMetricTypeCumulativeCounter, nil), + doubleSFxDataPoint("delta_double_with_dims", &sfxMetricTypeCounter, nil), + int64SFxDataPoint("delta_int_with_dims", &sfxMetricTypeCounter, nil), + doubleSFxDataPoint("gauge_sum_double_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("gauge_sum_int_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("histo_empty_metric_count", &sfxMetricTypeCumulativeCounter, nil), + }, + }, + { + name: "nil_node_and_resources_with_dims", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_double_with_dims") + initDoublePtWithLabels(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_int_with_dims") + initInt64PtWithLabels(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + initDoublePtWithLabels(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + initInt64PtWithLabels(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_with_no_buckets_dims") + initHistDPNoBuckets(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_with_buckets_dims") + initHistDP(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + doubleSFxDataPoint("gauge_double_with_dims", &sfxMetricTypeGauge, labelMap), + int64SFxDataPoint("gauge_int_with_dims", &sfxMetricTypeGauge, labelMap), + doubleSFxDataPoint("cumulative_double_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("cumulative_int_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("histo_with_no_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), + doubleSFxDataPoint("histo_with_no_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("histo_with_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), + doubleSFxDataPoint("histo_with_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), + histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket1), 4), + histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket2), 6), + histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket3), 9), + histoValue(int64SFxDataPoint("histo_with_buckets_dims_bucket", &sfxMetricTypeCumulativeCounter, labelMapBucket4), 16), + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + c, err := NewMetricsConverter(logger, nil, tt.excludeMetrics, tt.includeMetrics, "", false) + require.NoError(t, err) + md := tt.metricsFn() + gotSfxDataPoints := c.MetricsToSignalFxV2(md) + // Sort SFx dimensions since they are built from maps and the order + // of those is not deterministic. + sortDimensions(tt.wantSfxDataPoints) + sortDimensions(gotSfxDataPoints) + assert.Equal(t, tt.wantSfxDataPoints, gotSfxDataPoints) + }) + } + + testsWithDropHistogramBuckets := []struct { + name string + metricsFn func() pmetric.Metrics + excludeMetrics []dpfilters.MetricFilter + includeMetrics []dpfilters.MetricFilter + wantSfxDataPoints []*sfxpb.DataPoint + }{ + { + name: "nil_node_nil_resources_no_dims", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_double_with_dims") + initDoublePt(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_int_with_dims") + initInt64Pt(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("delta_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("delta_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_sum_double_with_dims") + m.SetEmptySum().SetIsMonotonic(false) + initDoublePt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_sum_int_with_dims") + m.SetEmptySum().SetIsMonotonic(false) + initInt64Pt(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_empty_metric") + initHistPt(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + doubleSFxDataPoint("gauge_double_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("gauge_int_with_dims", &sfxMetricTypeGauge, nil), + doubleSFxDataPoint("cumulative_double_with_dims", &sfxMetricTypeCumulativeCounter, nil), + int64SFxDataPoint("cumulative_int_with_dims", &sfxMetricTypeCumulativeCounter, nil), + doubleSFxDataPoint("delta_double_with_dims", &sfxMetricTypeCounter, nil), + int64SFxDataPoint("delta_int_with_dims", &sfxMetricTypeCounter, nil), + doubleSFxDataPoint("gauge_sum_double_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("gauge_sum_int_with_dims", &sfxMetricTypeGauge, nil), + int64SFxDataPoint("histo_empty_metric_count", &sfxMetricTypeCumulativeCounter, nil), + }, + }, + { + name: "nil_node_and_resources_with_dims", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_double_with_dims") + initDoublePtWithLabels(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("gauge_int_with_dims") + initInt64PtWithLabels(m.SetEmptyGauge().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_double_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + initDoublePtWithLabels(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("cumulative_int_with_dims") + m.SetEmptySum().SetIsMonotonic(true) + initInt64PtWithLabels(m.Sum().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_with_no_buckets_dims") + initHistDPNoBuckets(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + { + m := ilm.Metrics().AppendEmpty() + m.SetName("histo_with_buckets_dims") + initHistDP(m.SetEmptyHistogram().DataPoints().AppendEmpty()) + } + + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + doubleSFxDataPoint("gauge_double_with_dims", &sfxMetricTypeGauge, labelMap), + int64SFxDataPoint("gauge_int_with_dims", &sfxMetricTypeGauge, labelMap), + doubleSFxDataPoint("cumulative_double_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("cumulative_int_with_dims", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("histo_with_no_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), + doubleSFxDataPoint("histo_with_no_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), + int64SFxDataPoint("histo_with_buckets_dims_count", &sfxMetricTypeCumulativeCounter, labelMap), + doubleSFxDataPoint("histo_with_buckets_dims_sum", &sfxMetricTypeCumulativeCounter, labelMap), + }, + }, + } + + for _, tt := range testsWithDropHistogramBuckets { + t.Run(tt.name, func(t *testing.T) { + c, err := NewMetricsConverter(logger, nil, tt.excludeMetrics, tt.includeMetrics, "", true) + require.NoError(t, err) + md := tt.metricsFn() + gotSfxDataPoints := c.MetricsToSignalFxV2(md) + + // Sort SFx dimensions since they are built from maps and the order + // of those is not deterministic. + sortDimensions(tt.wantSfxDataPoints) + sortDimensions(gotSfxDataPoints) + assert.Equal(t, tt.wantSfxDataPoints, gotSfxDataPoints) + }) + } +} + func TestMetricDataToSignalFxV2WithTranslation(t *testing.T) { translator, err := NewMetricTranslator([]Rule{ { @@ -720,7 +1030,7 @@ func TestMetricDataToSignalFxV2WithTranslation(t *testing.T) { }, }, } - c, err := NewMetricsConverter(zap.NewNop(), translator, nil, nil, "") + c, err := NewMetricsConverter(zap.NewNop(), translator, nil, nil, "", false) require.NoError(t, err) assert.EqualValues(t, expected, c.MetricsToSignalFxV2(md)) } @@ -759,7 +1069,7 @@ func TestDimensionKeyCharsWithPeriod(t *testing.T) { }, }, } - c, err := NewMetricsConverter(zap.NewNop(), translator, nil, nil, "_-.") + c, err := NewMetricsConverter(zap.NewNop(), translator, nil, nil, "_-.", false) require.NoError(t, err) assert.EqualValues(t, expected, c.MetricsToSignalFxV2(md)) @@ -777,7 +1087,7 @@ func TestInvalidNumberOfDimensions(t *testing.T) { for i := 0; i < 10; i++ { dp.Attributes().PutStr(fmt.Sprint("dim_key_", i), fmt.Sprint("dim_val_", i)) } - c, err := NewMetricsConverter(logger, nil, nil, nil, "_-.") + c, err := NewMetricsConverter(logger, nil, nil, nil, "_-.", false) require.NoError(t, err) assert.EqualValues(t, 1, len(c.MetricsToSignalFxV2(md))) // No log message should be printed @@ -883,7 +1193,7 @@ func TestNewMetricsConverter(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := NewMetricsConverter(zap.NewNop(), nil, tt.excludes, nil, "") + got, err := NewMetricsConverter(zap.NewNop(), nil, tt.excludes, nil, "", false) if tt.wantErr { assert.Error(t, err) return @@ -943,7 +1253,7 @@ func TestMetricsConverter_ConvertDimension(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - c, err := NewMetricsConverter(zap.NewNop(), tt.fields.metricTranslator, nil, nil, tt.fields.nonAlphanumericDimChars) + c, err := NewMetricsConverter(zap.NewNop(), tt.fields.metricTranslator, nil, nil, tt.fields.nonAlphanumericDimChars, false) require.NoError(t, err) if got := c.ConvertDimension(tt.args.dim); got != tt.want { t.Errorf("ConvertDimension() = %v, want %v", got, tt.want) diff --git a/exporter/signalfxexporter/internal/translation/translator_test.go b/exporter/signalfxexporter/internal/translation/translator_test.go index 694f081a404c..288f2d500336 100644 --- a/exporter/signalfxexporter/internal/translation/translator_test.go +++ b/exporter/signalfxexporter/internal/translation/translator_test.go @@ -2960,7 +2960,7 @@ func testConverter(t *testing.T, mapping map[string]string) *MetricsConverter { tr, err := NewMetricTranslator(rules, 1) require.NoError(t, err) - c, err := NewMetricsConverter(zap.NewNop(), tr, nil, nil, "") + c, err := NewMetricsConverter(zap.NewNop(), tr, nil, nil, "", false) require.NoError(t, err) return c } diff --git a/exporter/tanzuobservabilityexporter/README.md b/exporter/tanzuobservabilityexporter/README.md index d5dcfc8c5a64..65016f80d9e5 100644 --- a/exporter/tanzuobservabilityexporter/README.md +++ b/exporter/tanzuobservabilityexporter/README.md @@ -1,17 +1,26 @@ -# Tanzu Observability (Wavefront) Exporter +# Deprecated Tanzu Observability (Wavefront) Exporter + +> [!WARNING] +> Tanzu Observability (Wavefront) Proxy v11.3 supports native OpenTelemetry protocol (OTLP) ingestion of traces and metrics, released in June 2022. +> This vendor specific exporter is deprecated and will become unavailable after the end of 2023. +> +> Refer to our [documentation](https://docs.wavefront.com/opentelemetry_overview.html) for configuring the Proxy to receive traces and metrics via OTLP gRPC or OTLP HTTP. +> + | Status | | | ------------- |-----------| -| Stability | [beta]: traces, metrics | +| Stability | [deprecated]: traces, metrics | | Distributions | [contrib] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Ftanzuobservability%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Ftanzuobservability) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Ftanzuobservability%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Ftanzuobservability) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@oppegard](https://www.github.com/oppegard), [@thepeterstone](https://www.github.com/thepeterstone), [@keep94](https://www.github.com/keep94) | -[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta +[deprecated]: https://github.com/open-telemetry/opentelemetry-collector#deprecated [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib + This exporter supports sending metrics and traces to [Tanzu Observability](https://tanzu.vmware.com/observability). ## Prerequisites diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 6430a65af21b..b0ffd45354be 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -1,10 +1,11 @@ +// Deprecated: the Tanzu Observability Exporter is deprecated and will be removed in future versions. Please see the README for more information. module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuobservabilityexporter go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/stretchr/testify v1.8.4 github.com/wavefronthq/wavefront-sdk-go v0.13.0 @@ -97,7 +98,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 019c1867cb6b..2baa151912c6 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -201,8 +201,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -743,8 +743,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/exporter/tanzuobservabilityexporter/internal/metadata/generated_status.go b/exporter/tanzuobservabilityexporter/internal/metadata/generated_status.go index 2800de7baf18..a5a6b8f99230 100644 --- a/exporter/tanzuobservabilityexporter/internal/metadata/generated_status.go +++ b/exporter/tanzuobservabilityexporter/internal/metadata/generated_status.go @@ -8,6 +8,6 @@ import ( const ( Type = "tanzuobservability" - TracesStability = component.StabilityLevelBeta - MetricsStability = component.StabilityLevelBeta + TracesStability = component.StabilityLevelDeprecated + MetricsStability = component.StabilityLevelDeprecated ) diff --git a/exporter/tanzuobservabilityexporter/metadata.yaml b/exporter/tanzuobservabilityexporter/metadata.yaml index 0f5dcb25db32..c934fb5585b1 100644 --- a/exporter/tanzuobservabilityexporter/metadata.yaml +++ b/exporter/tanzuobservabilityexporter/metadata.yaml @@ -3,7 +3,7 @@ type: tanzuobservability status: class: exporter stability: - beta: [traces, metrics] + deprecated: [traces, metrics] distributions: [contrib] codeowners: active: [oppegard, thepeterstone, keep94] diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index f7429c69775c..7278054e0631 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.4 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/config/configopaque v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index da185239cadf..36b385681698 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -270,8 +270,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 h1:Owbauh0pI5HNddLgoozHEgwZMMXh1WL2fDhRZTMHcmg= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 h1:2e3mYN464zl3jaCIDb/CcKEYi7hW22MsdJqBGknjq0U= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 0bf2c65abd41..a55a4e47e5c5 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -19,7 +19,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 10ed374ca499..8eb6157f9505 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -98,8 +98,9 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 2c4e03dd2e84..f983cb9c4258 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -15,7 +15,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index b0854effee39..509f7af2fc12 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/extension/basicauthextension/README.md b/extension/basicauthextension/README.md index 4b2afdc34120..b53d78dc061f 100644 --- a/extension/basicauthextension/README.md +++ b/extension/basicauthextension/README.md @@ -3,7 +3,7 @@ | Status | | | ------------- |-----------| | Stability | [beta] | -| Distributions | [contrib], [grafana], [observiq], [redhat], [sumo] | +| Distributions | [contrib], [grafana], [observiq], [redhat], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fbasicauth%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fbasicauth) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fbasicauth%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fbasicauth) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@svrakitin](https://www.github.com/svrakitin), [@frzifus](https://www.github.com/frzifus) | @@ -12,6 +12,7 @@ [grafana]: https://github.com/grafana/agent [observiq]: https://github.com/observIQ/observiq-otel-collector [redhat]: https://github.com/os-observability/redhat-opentelemetry-collector +[splunk]: https://github.com/signalfx/splunk-otel-collector [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/extension/basicauthextension/metadata.yaml b/extension/basicauthextension/metadata.yaml index c0527c62c0d4..4949c241e720 100644 --- a/extension/basicauthextension/metadata.yaml +++ b/extension/basicauthextension/metadata.yaml @@ -9,6 +9,7 @@ status: - grafana - observiq - redhat + - splunk - sumo codeowners: active: [jpkrohling, svrakitin, frzifus] diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 7984a682ed26..c93b34f4cb89 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -3,7 +3,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/healt go 1.20 require ( - github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 49255090c7b7..533469daf15d 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -142,8 +142,6 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N16Ip7M= -github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= diff --git a/extension/healthcheckextension/healthcheckextension.go b/extension/healthcheckextension/healthcheckextension.go index 8567c00b1fba..b3c0634bec97 100644 --- a/extension/healthcheckextension/healthcheckextension.go +++ b/extension/healthcheckextension/healthcheckextension.go @@ -10,11 +10,12 @@ import ( "net/http" "time" - "github.com/jaegertracing/jaeger/pkg/healthcheck" "go.opencensus.io/stats/view" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension/internal/healthcheck" ) type healthCheckExtension struct { diff --git a/extension/healthcheckextension/internal/healthcheck/handler.go b/extension/healthcheckextension/internal/healthcheck/handler.go new file mode 100644 index 000000000000..2f55d9ab7fb7 --- /dev/null +++ b/extension/healthcheckextension/internal/healthcheck/handler.go @@ -0,0 +1,147 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 +// +// Copyright (c) 2019 The Jaeger Authors. +// Copyright (c) 2017 Uber Technologies, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package healthcheck // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension/internal/healthcheck" + +import ( + "encoding/json" + "fmt" + "net/http" + "sync/atomic" + "time" + + "go.uber.org/zap" +) + +// Status represents the state of the service. +type Status int + +const ( + // Unavailable indicates the service is not able to handle requests + Unavailable Status = iota + // Ready indicates the service is ready to handle requests + Ready + // Broken indicates that the healthcheck itself is broken, not serving HTTP + Broken +) + +func (s Status) String() string { + switch s { + case Unavailable: + return "unavailable" + case Ready: + return "ready" + case Broken: + return "broken" + default: + return "unknown" + } +} + +type healthCheckResponse struct { + statusCode int + StatusMsg string `json:"status"` + UpSince time.Time `json:"upSince"` + Uptime string `json:"uptime"` +} + +type state struct { + status Status + upSince time.Time +} + +// HealthCheck provides an HTTP endpoint that returns the health status of the service +type HealthCheck struct { + state atomic.Value // stores state struct + logger *zap.Logger + responses map[Status]healthCheckResponse +} + +// New creates a HealthCheck with the specified initial state. +func New() *HealthCheck { + hc := &HealthCheck{ + logger: zap.NewNop(), + responses: map[Status]healthCheckResponse{ + Unavailable: { + statusCode: http.StatusServiceUnavailable, + StatusMsg: "Server not available", + }, + Ready: { + statusCode: http.StatusOK, + StatusMsg: "Server available", + }, + }, + } + hc.state.Store(state{status: Unavailable}) + return hc +} + +// SetLogger initializes a logger. +func (hc *HealthCheck) SetLogger(logger *zap.Logger) { + hc.logger = logger +} + +// Handler creates a new HTTP handler. +func (hc *HealthCheck) Handler() http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + hcState := hc.getState() + template := hc.responses[hcState.status] + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(template.statusCode) + + _, _ = w.Write(hc.createRespBody(hcState, template)) + }) +} + +func (hc *HealthCheck) createRespBody(state state, template healthCheckResponse) []byte { + resp := template // clone + if state.status == Ready { + resp.UpSince = state.upSince + resp.Uptime = fmt.Sprintf("%v", time.Since(state.upSince)) + } + healthCheckStatus, _ := json.Marshal(resp) + return healthCheckStatus +} + +// Set a new health check status +func (hc *HealthCheck) Set(status Status) { + oldState := hc.getState() + newState := state{status: status} + if status == Ready { + if oldState.status != Ready { + newState.upSince = time.Now() + } + } + hc.state.Store(newState) + hc.logger.Info("Health Check state change", zap.Stringer("status", status)) +} + +// Get the current status of this health check +func (hc *HealthCheck) Get() Status { + return hc.getState().status +} + +func (hc *HealthCheck) getState() state { + return hc.state.Load().(state) +} + +// Ready is a shortcut for Set(Ready) (kept for backwards compatibility) +func (hc *HealthCheck) Ready() { + hc.Set(Ready) +} diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 5f0c11b5110a..662147c532ee 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -15,7 +15,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling/internal/metadata" ) -// NewFactory creates a factory for the OIDC Authenticator extension. +// NewFactory creates a factory for the jaeger remote sampling extension. func NewFactory() extension.Factory { return extension.NewFactory( metadata.Type, diff --git a/extension/oauth2clientauthextension/factory.go b/extension/oauth2clientauthextension/factory.go index 867a3b32a67e..ea799d42cb58 100644 --- a/extension/oauth2clientauthextension/factory.go +++ b/extension/oauth2clientauthextension/factory.go @@ -13,7 +13,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension/internal/metadata" ) -// NewFactory creates a factory for the OIDC Authenticator extension. +// NewFactory creates a factory for the oauth2 client Authenticator extension. func NewFactory() extension.Factory { return extension.NewFactory( metadata.Type, diff --git a/extension/observer/dockerobserver/extension.go b/extension/observer/dockerobserver/extension.go index 8c54bfb5591d..b171b3eb8fe7 100644 --- a/extension/observer/dockerobserver/extension.go +++ b/extension/observer/dockerobserver/extension.go @@ -119,17 +119,16 @@ func (d *dockerObserver) ListEndpoints() []observer.Endpoint { // containerEndpoints generates a list of observer.Endpoint given a Docker ContainerJSON. // This function will only generate endpoints if a container is in the Running state and not Paused. func (d *dockerObserver) containerEndpoints(c *dtypes.ContainerJSON) []observer.Endpoint { - var endpoints []observer.Endpoint if !c.State.Running || c.State.Running && c.State.Paused { - return endpoints + return nil } knownPorts := map[nat.Port]bool{} for k := range c.Config.ExposedPorts { knownPorts[k] = true } - + endpoints := make([]observer.Endpoint, 0, len(knownPorts)) // iterate over exposed ports and try to create endpoints for portObj := range knownPorts { endpoint := d.endpointForPort(portObj, c) diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 6aee78d6b029..b994d1e2e410 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -29,7 +29,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 14f9419dfd28..510b93188166 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -129,8 +129,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/extension/observer/ecsobserver/docker_label.go b/extension/observer/ecsobserver/docker_label.go index 13bb5b36f3b4..fad49d32650f 100644 --- a/extension/observer/ecsobserver/docker_label.go +++ b/extension/observer/ecsobserver/docker_label.go @@ -54,11 +54,11 @@ func (d *DockerLabelConfig) newMatcher(options matcherOptions) (targetMatcher, e } func dockerLabelConfigToMatchers(cfgs []DockerLabelConfig) []matcherConfig { - var matchers []matcherConfig - for _, cfg := range cfgs { + matchers := make([]matcherConfig, len(cfgs)) + for i, cfg := range cfgs { // NOTE: &cfg points to the temp var, whose value would end up be the last one in the slice. copied := cfg - matchers = append(matchers, &copied) + matchers[i] = &copied } return matchers } diff --git a/extension/observer/ecsobserver/fetcher.go b/extension/observer/ecsobserver/fetcher.go index 5605bca9a364..cf21efafcb4d 100644 --- a/extension/observer/ecsobserver/fetcher.go +++ b/extension/observer/ecsobserver/fetcher.go @@ -219,12 +219,12 @@ func (f *taskFetcher) attachTaskDefinition(ctx context.Context, tasks []*ecs.Tas arn2Def[arn] = def } - var tasksWithDef []*taskAnnotated - for _, t := range tasks { - tasksWithDef = append(tasksWithDef, &taskAnnotated{ + tasksWithDef := make([]*taskAnnotated, len(tasks)) + for i, t := range tasks { + tasksWithDef[i] = &taskAnnotated{ Task: t, Definition: arn2Def[aws.StringValue(t.TaskDefinitionArn)], - }) + } } return tasksWithDef, nil } @@ -300,11 +300,11 @@ func (f *taskFetcher) describeContainerInstances(ctx context.Context, instanceLi } // Create the index to map ec2 id back to container instance id. - var ec2Ids []*string + ec2Ids := make([]*string, len(res.ContainerInstances)) ec2IdToCI := make(map[string]string) - for _, containerInstance := range res.ContainerInstances { + for i, containerInstance := range res.ContainerInstances { ec2Id := containerInstance.Ec2InstanceId - ec2Ids = append(ec2Ids, ec2Id) + ec2Ids[i] = ec2Id ec2IdToCI[aws.StringValue(ec2Id)] = aws.StringValue(containerInstance.ContainerInstanceArn) } @@ -414,9 +414,9 @@ func (f *taskFetcher) attachService(tasks []*taskAnnotated, services []*ecs.Serv // Util Start func sortStringPointers(ps []*string) { - var ss []string - for _, p := range ps { - ss = append(ss, aws.StringValue(p)) + ss := make([]string, len(ps)) + for i, p := range ps { + ss[i] = aws.StringValue(p) } sort.Strings(ss) for i := range ss { diff --git a/extension/observer/ecsobserver/filter.go b/extension/observer/ecsobserver/filter.go index 3cdbd05915ea..43ee6cee724f 100644 --- a/extension/observer/ecsobserver/filter.go +++ b/extension/observer/ecsobserver/filter.go @@ -59,19 +59,21 @@ func (f *taskFilter) filter(tasks []*taskAnnotated) ([]*taskAnnotated, error) { } // Sort by task index so the output is consistent. - var taskIndexes []int + taskIndexes := make([]int, len(matchedTasks)) + i := 0 for k := range matchedTasks { - taskIndexes = append(taskIndexes, k) + taskIndexes[i] = k + i++ } sort.Ints(taskIndexes) - var sortedTasks []*taskAnnotated - for _, i := range taskIndexes { + sortedTasks := make([]*taskAnnotated, len(taskIndexes)) + for index, i := range taskIndexes { task := tasks[i] // Sort containers within a task sort.Slice(task.Matched, func(i, j int) bool { return task.Matched[i].ContainerIndex < task.Matched[j].ContainerIndex }) - sortedTasks = append(sortedTasks, task) + sortedTasks[index] = task } return sortedTasks, merr } diff --git a/extension/observer/ecsobserver/filter_test.go b/extension/observer/ecsobserver/filter_test.go index 8eecfb8d6b28..2c50ae1669e4 100644 --- a/extension/observer/ecsobserver/filter_test.go +++ b/extension/observer/ecsobserver/filter_test.go @@ -29,7 +29,7 @@ func TestFilter(t *testing.T) { f := newTestTaskFilter(t, cfgTaskDefOnly) res, err := f.filter(nil) require.NoError(t, err) - assert.Nil(t, res) + assert.Empty(t, res) }) emptyTask := &taskAnnotated{ diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 0d4a970c76b5..0b42e984273d 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/obser go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/hashicorp/golang-lru v1.0.2 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 8d08982b4b0c..a0517d92872d 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/extension/observer/ecsobserver/internal/ecsmock/service.go b/extension/observer/ecsobserver/internal/ecsmock/service.go index 41bd9e27f619..6489102f3053 100644 --- a/extension/observer/ecsobserver/internal/ecsmock/service.go +++ b/extension/observer/ecsobserver/internal/ecsmock/service.go @@ -114,10 +114,8 @@ func (c *Cluster) DescribeTasksWithContext(_ context.Context, input *ecs.Describ if err := checkCluster(input.Cluster, c.name); err != nil { return nil, err } - var ( - failures []*ecs.Failure - tasks []*ecs.Task - ) + var failures []*ecs.Failure + tasks := make([]*ecs.Task, 0, len(input.Tasks)) for i, taskArn := range input.Tasks { arn := aws.StringValue(taskArn) task, ok := c.taskMap[arn] @@ -149,10 +147,8 @@ func (c *Cluster) DescribeContainerInstancesWithContext(_ context.Context, input if err := checkCluster(input.Cluster, c.name); err != nil { return nil, err } - var ( - instances []*ecs.ContainerInstance - failures []*ecs.Failure - ) + var failures []*ecs.Failure + instances := make([]*ecs.ContainerInstance, 0, len(input.ContainerInstances)) for _, cid := range input.ContainerInstances { ci, ok := c.containerInstanceMap[aws.StringValue(cid)] if !ok { @@ -230,10 +226,8 @@ func (c *Cluster) DescribeServicesWithContext(_ context.Context, input *ecs.Desc if err := checkCluster(input.Cluster, c.name); err != nil { return nil, err } - var ( - failures []*ecs.Failure - services []*ecs.Service - ) + var failures []*ecs.Failure + services := make([]*ecs.Service, 0, len(input.Services)) for i, serviceArn := range input.Services { arn := aws.StringValue(serviceArn) svc, ok := c.serviceMap[arn] diff --git a/extension/observer/ecsobserver/internal/errctx/value.go b/extension/observer/ecsobserver/internal/errctx/value.go index 50b4f9d2038b..7cdc4ac708f4 100644 --- a/extension/observer/ecsobserver/internal/errctx/value.go +++ b/extension/observer/ecsobserver/internal/errctx/value.go @@ -126,7 +126,7 @@ type valuesError struct { func (e *valuesError) Error() string { // NOTE: in order to have a consistent output, we sort the keys - var keys []string + keys := make([]string, 0, len(e.values)) for k := range e.values { keys = append(keys, k) } diff --git a/extension/observer/ecsobserver/service.go b/extension/observer/ecsobserver/service.go index 54e0e0aff05d..3f63317fd294 100644 --- a/extension/observer/ecsobserver/service.go +++ b/extension/observer/ecsobserver/service.go @@ -57,11 +57,11 @@ func (s *ServiceConfig) newMatcher(opts matcherOptions) (targetMatcher, error) { } func serviceConfigsToMatchers(cfgs []ServiceConfig) []matcherConfig { - var matchers []matcherConfig - for _, cfg := range cfgs { + matchers := make([]matcherConfig, len(cfgs)) + for i, cfg := range cfgs { // NOTE: &cfg points to the temp var, whose value would end up be the last one in the slice. copied := cfg - matchers = append(matchers, &copied) + matchers[i] = &copied } return matchers } @@ -100,13 +100,13 @@ func serviceConfigsToFilter(cfgs []ServiceConfig) (serviceNameFilter, error) { return false }, nil } - var regs []*regexp.Regexp - for _, cfg := range cfgs { + regs := make([]*regexp.Regexp, len(cfgs)) + for i, cfg := range cfgs { r, err := regexp.Compile(cfg.NamePattern) if err != nil { return nil, fmt.Errorf("invalid service name pattern %q: %w", cfg.NamePattern, err) } - regs = append(regs, r) + regs[i] = r } return func(name string) bool { for _, r := range regs { diff --git a/extension/observer/ecsobserver/target.go b/extension/observer/ecsobserver/target.go index ac34d59c35bf..70f8d0bb66a3 100644 --- a/extension/observer/ecsobserver/target.go +++ b/extension/observer/ecsobserver/target.go @@ -136,9 +136,9 @@ type fileSDTarget struct { } func targetsToFileSDTargets(targets []prometheusECSTarget, jobLabelName string) ([]fileSDTarget, error) { - var converted []fileSDTarget + converted := make([]fileSDTarget, len(targets)) omitEmpty := []string{labelJob, labelServiceName} - for _, t := range targets { + for i, t := range targets { labels := t.ToLabels() address, ok := labels[labelAddress] if !ok { @@ -168,7 +168,7 @@ func targetsToFileSDTargets(targets []prometheusECSTarget, jobLabelName string) Targets: []string{address}, Labels: labels, } - converted = append(converted, pt) + converted[i] = pt } return converted, nil } diff --git a/extension/observer/ecsobserver/task_definition.go b/extension/observer/ecsobserver/task_definition.go index 5dd1b93c32f6..37002def94e1 100644 --- a/extension/observer/ecsobserver/task_definition.go +++ b/extension/observer/ecsobserver/task_definition.go @@ -57,11 +57,11 @@ func (t *TaskDefinitionConfig) newMatcher(opts matcherOptions) (targetMatcher, e } func taskDefinitionConfigsToMatchers(cfgs []TaskDefinitionConfig) []matcherConfig { - var matchers []matcherConfig - for _, cfg := range cfgs { + matchers := make([]matcherConfig, len(cfgs)) + for i, cfg := range cfgs { // NOTE: &cfg points to the temp var, whose value would end up be the last one in the slice. copied := cfg - matchers = append(matchers, &copied) + matchers[i] = &copied } return matchers } diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index bb3846f46c43..c03e63ad4829 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -27,7 +27,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 59eb0484722e..db5a29debc09 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -188,8 +188,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 869953628c72..d0b52cb17f8e 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4 go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.20.1 - github.com/aws/aws-sdk-go-v2/config v1.18.33 - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 + github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2/config v1.18.36 + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 @@ -17,14 +17,14 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 997a27cd0c1b..08d3f77ab798 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -12,39 +12,39 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= -github.com/aws/aws-sdk-go-v2/config v1.18.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/go.mod b/go.mod index 3bf8a5959f25..37c7f2858fa3 100644 --- a/go.mod +++ b/go.mod @@ -168,7 +168,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.83.0 go.opentelemetry.io/collector v0.83.0 - go.opentelemetry.io/collector/confmap v0.83.0 go.opentelemetry.io/collector/exporter v0.83.0 go.opentelemetry.io/collector/exporter/loggingexporter v0.83.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0 @@ -193,7 +192,7 @@ require ( cloud.google.com/go/longrunning v0.5.1 // indirect cloud.google.com/go/monitoring v1.15.1 // indirect cloud.google.com/go/pubsub v1.33.0 // indirect - cloud.google.com/go/spanner v1.47.0 // indirect + cloud.google.com/go/spanner v1.48.0 // indirect cloud.google.com/go/trace v1.10.1 // indirect code.cloudfoundry.org/clock v1.0.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect @@ -226,8 +225,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.0.0 // indirect - github.com/ClickHouse/ch-go v0.52.1 // indirect - github.com/ClickHouse/clickhouse-go/v2 v2.13.0 // indirect + github.com/ClickHouse/ch-go v0.58.2 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.13.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect @@ -250,10 +249,10 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 // indirect github.com/IBM/sarama v1.40.1 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect @@ -265,36 +264,36 @@ require ( github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect github.com/alecthomas/participle/v2 v2.0.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/aliyun/aliyun-log-go-sdk v0.1.51 // indirect + github.com/aliyun/aliyun-log-go-sdk v0.1.53 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/antonmedv/expr v1.13.0 // indirect + github.com/antonmedv/expr v1.14.3 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/pulsar-client-go v0.8.1 // indirect github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect github.com/apache/thrift v0.18.1 // indirect 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.44.323 // indirect - github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.33 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.36 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // 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.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // 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.9.11 // 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.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // 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.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect @@ -381,12 +380,12 @@ require ( github.com/google/btree v1.1.2 // indirect github.com/google/cadvisor v0.47.3 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect - github.com/google/gnostic v0.6.9 // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -481,7 +480,7 @@ require ( github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mongodb-forks/digest v1.0.4 // indirect + github.com/mongodb-forks/digest v1.0.5 // indirect github.com/montanaflynn/stats v0.7.0 // indirect github.com/mostynb/go-grpc-compression v1.2.0 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect @@ -540,7 +539,7 @@ require ( github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/sftp v1.13.5 // indirect @@ -559,7 +558,7 @@ require ( github.com/rs/cors v1.9.0 // indirect github.com/samber/lo v1.37.0 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect - github.com/scalyr/dataset-go v0.12.1 // indirect + github.com/scalyr/dataset-go v0.14.0 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -571,7 +570,7 @@ require ( github.com/signalfx/golib/v3 v3.3.47 // indirect github.com/signalfx/sapm-proto v0.13.0 // indirect github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect - github.com/sijms/go-ora/v2 v2.7.11 // indirect + github.com/sijms/go-ora/v2 v2.7.15 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/snowflakedb/gosnowflake v1.6.23 // indirect github.com/soheilhy/cmux v0.1.5 // indirect @@ -586,7 +585,7 @@ require ( github.com/stretchr/testify v1.8.4 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 // indirect github.com/tg123/go-htpasswd v1.2.1 // indirect github.com/tidwall/gjson v1.14.3 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -627,17 +626,18 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect go.opentelemetry.io/collector/config/internal v0.83.0 // indirect + go.opentelemetry.io/collector/confmap v0.83.0 // indirect go.opentelemetry.io/collector/connector v0.83.0 // indirect go.opentelemetry.io/collector/consumer v0.83.0 // indirect go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect @@ -646,10 +646,10 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.2.1 // indirect @@ -667,8 +667,8 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect @@ -682,14 +682,14 @@ require ( 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.27.4 // indirect - k8s.io/apimachinery v0.27.4 // indirect - k8s.io/client-go v0.27.4 // indirect + k8s.io/api v0.28.1 // indirect + k8s.io/apimachinery v0.28.1 // indirect + k8s.io/client-go v0.28.1 // indirect k8s.io/klog v1.0.0 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/kubelet v0.27.4 // indirect - k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/controller-runtime v0.15.1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/go.sum b/go.sum index 8398c8419522..4995a20f8572 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+ cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= -cloud.google.com/go/spanner v1.47.0 h1:aqiMP8dhsEXgn9K5EZBWxPG7dxIiyM2VaikqeU4iteg= -cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= +cloud.google.com/go/spanner v1.48.0 h1:lh3Xqe2G+/bhJ1O3JxYt4ahYXOz/wPH4D2Wrx2vFoNI= +cloud.google.com/go/spanner v1.48.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= @@ -724,10 +724,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDm github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/ch-go v0.52.1 h1:nucdgfD1BDSHjbNaG3VNebonxJzD8fX8jbuBpfo5VY0= -github.com/ClickHouse/ch-go v0.52.1/go.mod h1:B9htMJ0hii/zrC2hljUKdnagRBuLqtRG/GrU3jqCwRk= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbOtM+e/3qdexG9k= -github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0= +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.13.2 h1:LSg6670+xbd5VczO5Ei3DHZBIeGulfwhNuHCUth/qOA= +github.com/ClickHouse/clickhouse-go/v2 v2.13.2/go.mod h1:4QITCrdY/ugPYA+QGnJ92h+v7TGaZQ7l0393Q/wlM3Q= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= @@ -779,15 +779,15 @@ github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaa github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 h1:ugYJK/neZQtQeh2jc5xNoDFiMQojlAkoqJMRb7vTu1U= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0 h1:1iUFJlwEsO3jbEitj0i9+XIjaY1QsjnUy7J3J81HuH4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.42.0/go.mod h1:otJdxGjog6MfV/93oprfeXgyFrGrqsVvDhdM6P779Rk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0 h1:Fa7XySHYw2HdumRuo2TYiYK5LkGJuwzTiqAPFoZ7t1s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.42.0/go.mod h1:7BFtqicd8QzUKtbxBHq8/by6aMYL3mmnEEK0vLtVins= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0 h1:82lUmcpHzBEpGP4qURZvMSU1rJV0AAfXtOCh7Qz6oDw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.18.0/go.mod h1:6abS6wU43wU97qP+JseSJq2+C8/XL50co74AhoMJwwU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.42.0 h1:thAXdOpdEJPWW7kZmD8wU/yhQjd7PA6L01TxFcR5OOY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0 h1:4gL61NwEDGAFvLJeEMjTYJm6r1T26k3QYuDZK9YEaAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.42.0/go.mod h1:lz6DEePTxmjvYMtusOoS3qDAErC0STi/wmvqJucKY28= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1 h1:2oH2ROo0TCtGYIga4Mp78lQsERv6Ki9nmIkqiy5tQgM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.43.1/go.mod h1:mp8K83k9NeKyqV3LZPOqTi2aaH+gx1zALp0mlYYkjB4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1 h1:RZIhpzvjXPF4o7RPBXuyPMhHF0mhCRwtN3h1hPT8DBE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.43.1/go.mod h1:wNaetbDWzGD7k9d1/e0FQSy8qoF3vG2c4PkHgIWnmns= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1 h1:lP8YpTi26Bei2OrXpQEUnNFPqKT6bTn3P8DvJC4i8WQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.19.1/go.mod h1:g9zEQ45EhrGGA6HyCtxi8yL0BZ0vD+pVaqSkiLjVIzY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.43.1 h1:EA/FmSYRyeL2ZogHD8ZCPAt96UZh/U76wQjGhzRFEHE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1 h1:ti4stlXHjDhGl+1h+EpqXv9+Wxv0XqCB3XTT4W6ZoQU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.43.1/go.mod h1:lv7cjEH/BKG+7xh3vR4T8//UkWZ9eIkgAk6HpN/T6rk= github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= @@ -835,6 +835,8 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d h1:wvStE9wLpws31NiWUx+38wny1msZ/tm+eL5xmm4Y7So= +github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d/go.mod h1:9XMFaCeRyW7fC9XJOWQ+NdAv8VLG7ys7l3x4ozEGLUQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= @@ -888,8 +890,8 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/alexflint/go-filemutex v1.2.0/go.mod h1:mYyQSWvw9Tx2/H2n9qXPb52tTYfE0pZAWcBq5mK025c= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/aliyun/aliyun-log-go-sdk v0.1.51 h1:XEtzCGEUY2QAkMVy/5YoP/vlb9tDZdaaBnbAKlvaLVU= -github.com/aliyun/aliyun-log-go-sdk v0.1.51/go.mod h1:1QQ59pEJiVVXqKgbHcU6FWIgxT5RKBt+CT8AiQ2bEts= +github.com/aliyun/aliyun-log-go-sdk v0.1.53 h1:3kI+QASsOzxLI4Ij8LBOmRR+6zFIp1mlAdfOAdkiI8k= +github.com/aliyun/aliyun-log-go-sdk v0.1.53/go.mod h1:/U0mxwX7uG2K2fbfsF92BR64zmbmJyx7WQtyKaCdRL8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -899,8 +901,8 @@ github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQY github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antonmedv/expr v1.13.0 h1:8YrTtlCzlOtXw+hpeCLDLL2uo0C0k6jmYpYTGws5c5w= -github.com/antonmedv/expr v1.13.0/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= +github.com/antonmedv/expr v1.14.3 h1:GPrP7xKPWkFaLANPS7tPrgkNs7FMHpZdL72Dc5kFykg= +github.com/antonmedv/expr v1.14.3/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= @@ -945,41 +947,41 @@ github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= 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.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= 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.33 h1:JKcw5SFxFW/rpM4mOPjv0VQ11E2kxW13F3exWOy7VZU= -github.com/aws/aws-sdk-go-v2/config v1.18.33/go.mod h1:hXO/l9pgY3K5oZJldamP0pbZHdPqqk+4/maa7DSD3cA= +github.com/aws/aws-sdk-go-v2/config v1.18.36 h1:mLNA12PWU1Y+ueOO79QgQfKIPhc1MYKl44RmvASkJ7Q= +github.com/aws/aws-sdk-go-v2/config v1.18.36/go.mod h1:8AnEFxW9/XGKCbjYDCJy7iltVNyEI9Iu9qC21UzhhgQ= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= 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.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= 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.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= 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.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= 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.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= 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.39 h1:fc0ukRAiP1syoSGZYu+DaE+FulSYhTiJ8WpVu5jElU4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39/go.mod h1:WLAW8PT7+JhjZfLSWe7WEJaJu0GNo0cKc2Zyo003RBs= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 h1:DWYZIsyqagnWL00f8M/SOr9fN063OEQWn9LLTbdYXsk= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23/go.mod h1:uIiFgURZbACBEQJfqTZPb/jxO7R+9LeoHUFudtIdeQI= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= @@ -990,29 +992,29 @@ 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.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= 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.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= 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.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2/go.mod h1:7YAKee7SYksF6IAwXXuZ7bp4EIUBRJDysKZneqtspPM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA= 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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= 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.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= 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.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= 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.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw= github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -1457,7 +1459,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1818,8 +1819,8 @@ github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6 github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA= github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= +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= 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= @@ -1867,14 +1868,15 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2483,8 +2485,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb 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/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxnsSvZ64= -github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA= +github.com/mongodb-forks/digest v1.0.5 h1:EJu3wtLZcA0HCvsZpX5yuD193/sW9tHiNvrEM5apXMk= +github.com/mongodb-forks/digest v1.0.5/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= @@ -2713,8 +2715,8 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -2846,8 +2848,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -2879,8 +2881,8 @@ github.com/sanposhiho/wastedassign v0.1.3/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9k github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 h1:Y7xOFbD+3jaPw+VN7lkakNJ/pa+ZSQVFp1ONtJaBxns= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/scalyr/dataset-go v0.12.1 h1:B8xw2+HOW4B2i4BMEJyLhMcSEc35snjdyVIgOr8+dwI= -github.com/scalyr/dataset-go v0.12.1/go.mod h1:6Go51mPPv3TminPxEcbpmVki/UzXaMcrL4bseyziilQ= +github.com/scalyr/dataset-go v0.14.0 h1:uRkoUt6LcMcH3VUTjOakQ4aq+1ooJB2t47oqYRUkV/k= +github.com/scalyr/dataset-go v0.14.0/go.mod h1:+a4BvVyS7mKquK7ySuWh4vygyDBREQrdikdcnABYKFw= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2927,8 +2929,8 @@ github.com/signalfx/sapm-proto v0.13.0 h1:yEkp1+MAU4vZvnJMp56uhVlRjlvCK7KQjBg0g2 github.com/signalfx/sapm-proto v0.13.0/go.mod h1:C72HjeCW5v0Llk6pIVJ/ZH8A5GbiZpCCSkE1dSlpWxY= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 h1:FCyZbLP9tqrwca1CLRxosGCbBXzaL7oFXmEbrUbiwSM= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1/go.mod h1:92AQ/lCA08Aw2Eg8mgdIAak7IWyTbV5PZHocEO7vH0g= -github.com/sijms/go-ora/v2 v2.7.11 h1:RqyIXtTyIavMfQWAB/pRPbCo3m9daS4ks7sHzWSweaA= -github.com/sijms/go-ora/v2 v2.7.11/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.7.15 h1:39rGXS0lC3RzxcrlmfkrBAHzD6OKF+m3RI7VIyht6Ds= +github.com/sijms/go-ora/v2 v2.7.15/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -3046,8 +3048,8 @@ github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719 h1:Owbauh0pI5HNddLgoozHEgwZMMXh1WL2fDhRZTMHcmg= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.719/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729 h1:2e3mYN464zl3jaCIDb/CcKEYi7hW22MsdJqBGknjq0U= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.729/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs= github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I= github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= @@ -3324,8 +3326,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.3 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0/go.mod h1:HSmzQvagH8pS2/xrK7ScWsk0vAMtRTGbMFgInXCi8Tc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0/go.mod h1:U5rUt7Rw6zuORsWNfpMRy8XMNKLrmIlv/4HgLVW/d5M= @@ -3350,8 +3352,9 @@ go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -3392,8 +3395,9 @@ go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= @@ -3404,8 +3408,9 @@ go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= @@ -3422,8 +3427,9 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= @@ -3665,7 +3671,6 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -4128,8 +4133,9 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= @@ -4196,8 +4202,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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= @@ -4534,8 +4540,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= @@ -4544,8 +4550,8 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -4557,8 +4563,8 @@ k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= @@ -4589,8 +4595,9 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kms v0.26.2/go.mod h1:69qGnf1NsFOQP07fBYqNLZklqEHSJF024JqYCaeVxHg= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= @@ -4599,8 +4606,8 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/kubelet v0.27.4 h1:P8+MoRx4ikcAc5eEa3k2A6kd8AXtoDRaoC8KX2HFZe4= k8s.io/kubelet v0.27.4/go.mod h1:2y4peCA57vKEhBcDL6Q5EkPuGP7FFxj9U41NV9hk1ac= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= @@ -4612,8 +4619,8 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= diff --git a/internal/aws/awsutil/go.mod b/internal/aws/awsutil/go.mod index 3fbc2558201e..decb7e7a0e1d 100644 --- a/internal/aws/awsutil/go.mod +++ b/internal/aws/awsutil/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/aw go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.25.0 golang.org/x/net v0.14.0 diff --git a/internal/aws/awsutil/go.sum b/internal/aws/awsutil/go.sum index 02e187925c55..3a7b7226a3ff 100644 --- a/internal/aws/awsutil/go.sum +++ b/internal/aws/awsutil/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= 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= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index c457a2344cc7..d62ed30a92fe 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cw go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.uber.org/zap v1.25.0 diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index e14ab130bb2e..468c1da973dd 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/internal/aws/k8s/go.mod b/internal/aws/k8s/go.mod index fe7a0dec44a1..834a25efafa0 100644 --- a/internal/aws/k8s/go.mod +++ b/internal/aws/k8s/go.mod @@ -3,28 +3,28 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8 go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.25.0 - k8s.io/api v0.27.4 - k8s.io/apimachinery v0.27.4 - k8s.io/client-go v0.27.4 + k8s.io/api v0.28.1 + k8s.io/apimachinery v0.28.1 + k8s.io/client-go v0.28.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect - github.com/evanphx/json-patch v4.12.0+incompatible // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // 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/google/gnostic v0.5.7-v3refs // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.6 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -48,9 +48,9 @@ require ( 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/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/internal/aws/k8s/go.sum b/internal/aws/k8s/go.sum index 4217b13cbec2..1da56b59fd72 100644 --- a/internal/aws/k8s/go.sum +++ b/internal/aws/k8s/go.sum @@ -1,63 +1,41 @@ -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/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= 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/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= github.com/emicklei/go-restful/v3 v3.9.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/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/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/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +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-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.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/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -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/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 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= -github.com/google/gofuzz v1.1.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/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -70,9 +48,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/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -86,22 +63,19 @@ 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= 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= @@ -119,17 +93,9 @@ 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-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/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-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -140,16 +106,12 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -175,70 +137,44 @@ golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -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-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -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.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/internal/aws/k8s/k8sclient/clientset.go b/internal/aws/k8s/k8sclient/clientset.go index fad86ed898d0..d6e6e9061c7d 100644 --- a/internal/aws/k8s/k8sclient/clientset.go +++ b/internal/aws/k8s/k8sclient/clientset.go @@ -107,9 +107,9 @@ func InitSyncPollTimeout(pollTimeout time.Duration) Option { } func getStringifiedOptions(options ...Option) string { - var opts []string - for _, option := range options { - opts = append(opts, option.name) + opts := make([]string, len(options)) + for i, option := range options { + opts[i] = option.name } sort.Strings(opts) diff --git a/internal/aws/metrics/metric_calculator.go b/internal/aws/metrics/metric_calculator.go index 205ae5d39bae..80562799f287 100644 --- a/internal/aws/metrics/metric_calculator.go +++ b/internal/aws/metrics/metric_calculator.go @@ -61,7 +61,7 @@ func (rm *MetricCalculator) Calculate(mKey Key, value interface{}, timestamp tim cacheStore := rm.cache var result interface{} - done := false + var done bool rm.lock.Lock() defer rm.lock.Unlock() @@ -92,7 +92,7 @@ type Key struct { } func NewKey(metricMetadata interface{}, labels map[string]string) Key { - var kvs []attribute.KeyValue + kvs := make([]attribute.KeyValue, 0, len(labels)) var sortable attribute.Sortable for k, v := range labels { kvs = append(kvs, attribute.String(k, v)) diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index a2d2011c1b07..9654fc6e48c8 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/pr go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/config/confignet v0.83.0 diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 8c00dc0d34ae..2ef4e9175610 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= 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= diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index bd4ebb5b82c7..d4bf5ebc0d9b 100644 --- a/internal/aws/xray/go.mod +++ b/internal/aws/xray/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xr go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.83.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 diff --git a/internal/aws/xray/go.sum b/internal/aws/xray/go.sum index e14ab130bb2e..468c1da973dd 100644 --- a/internal/aws/xray/go.sum +++ b/internal/aws/xray/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/internal/aws/xray/testdata/sampleapp/go.mod b/internal/aws/xray/testdata/sampleapp/go.mod index eb337da1f026..bc1abf458182 100644 --- a/internal/aws/xray/testdata/sampleapp/go.mod +++ b/internal/aws/xray/testdata/sampleapp/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xr go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/aws/aws-xray-sdk-go v1.8.1 ) diff --git a/internal/aws/xray/testdata/sampleapp/go.sum b/internal/aws/xray/testdata/sampleapp/go.sum index 03db853f4064..4daa33cfde79 100644 --- a/internal/aws/xray/testdata/sampleapp/go.sum +++ b/internal/aws/xray/testdata/sampleapp/go.sum @@ -1,8 +1,8 @@ github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-xray-sdk-go v1.8.1 h1:O4pXV+hnCskaamGsZnFpzHyAmgPGusBMN6i7nnsy0Fo= github.com/aws/aws-xray-sdk-go v1.8.1/go.mod h1:wMmVYzej3sykAttNBkXQHK/+clAPWTOrPiajEk7Cp3A= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/internal/aws/xray/testdata/sampleserver/go.mod b/internal/aws/xray/testdata/sampleserver/go.mod index c56594394221..7fedb13881cc 100644 --- a/internal/aws/xray/testdata/sampleserver/go.mod +++ b/internal/aws/xray/testdata/sampleserver/go.mod @@ -6,7 +6,7 @@ require github.com/aws/aws-xray-sdk-go v1.8.1 require ( github.com/andybalholm/brotli v1.0.4 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/compress v1.16.7 // indirect diff --git a/internal/aws/xray/testdata/sampleserver/go.sum b/internal/aws/xray/testdata/sampleserver/go.sum index bceb60d16411..043235f098bc 100644 --- a/internal/aws/xray/testdata/sampleserver/go.sum +++ b/internal/aws/xray/testdata/sampleserver/go.sum @@ -1,8 +1,8 @@ github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-xray-sdk-go v1.8.1 h1:O4pXV+hnCskaamGsZnFpzHyAmgPGusBMN6i7nnsy0Fo= github.com/aws/aws-xray-sdk-go v1.8.1/go.mod h1:wMmVYzej3sykAttNBkXQHK/+clAPWTOrPiajEk7Cp3A= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/internal/coreinternal/attraction/attraction.go b/internal/coreinternal/attraction/attraction.go index c141f3402c68..abaf54832da2 100644 --- a/internal/coreinternal/attraction/attraction.go +++ b/internal/coreinternal/attraction/attraction.go @@ -172,7 +172,7 @@ type AttrProc struct { // and returns a AttrProc to be used to process attributes. // An error is returned if there are any invalid inputs. func NewAttrProc(settings *Settings) (*AttrProc, error) { - var attributeActions []attributeAction + attributeActions := make([]attributeAction, 0, len(settings.Actions)) for i, a := range settings.Actions { // Convert `action` to lowercase for comparison. a.Action = Action(strings.ToLower(string(a.Action))) diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index a6223f5e5e59..429a7be7fec7 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -6,6 +6,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/docker/go-connections v0.4.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.23.0 go.opentelemetry.io/collector v0.83.0 @@ -36,7 +37,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect @@ -51,7 +52,6 @@ require ( 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/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc4 // indirect github.com/opencontainers/runc v1.1.5 // indirect diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 54c0a5fd722a..b9f32875c8ce 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -128,8 +128,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/internal/coreinternal/golden/golden.go b/internal/coreinternal/golden/golden.go index 0e55a99e473e..5ab207d1e4a4 100644 --- a/internal/coreinternal/golden/golden.go +++ b/internal/coreinternal/golden/golden.go @@ -70,6 +70,7 @@ func MarshalMetricsYAML(metrics pmetric.Metrics) ([]byte, error) { // writeMetrics writes a pmetric.Metrics to the specified file in YAML format. func writeMetrics(filePath string, metrics pmetric.Metrics) error { sortMetrics(metrics) + normalizeTimestamps(metrics) b, err := MarshalMetricsYAML(metrics) if err != nil { return err diff --git a/internal/coreinternal/golden/golden_test.go b/internal/coreinternal/golden/golden_test.go index 3b3d9bb5e334..38c2fd2d6552 100644 --- a/internal/coreinternal/golden/golden_test.go +++ b/internal/coreinternal/golden/golden_test.go @@ -46,7 +46,7 @@ func TestReadMetrics(t *testing.T) { metricslice := testMetrics() expectedMetrics := pmetric.NewMetrics() metricslice.CopyTo(expectedMetrics.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty().Metrics()) - + normalizeTimestamps(expectedMetrics) expectedFile := filepath.Join("testdata", "roundtrip", "expected.yaml") actualMetrics, err := ReadMetrics(expectedFile) require.NoError(t, err) @@ -286,3 +286,17 @@ func CreateTestTraces() ptrace.Traces { return traces } + +func TestSortAndNormalizeMetrics(t *testing.T) { + dir := filepath.Join("testdata", "standardize-metrics") + before, err := ReadMetrics(filepath.Join(dir, "before.yaml")) + require.NoError(t, err) + + after, err := ReadMetrics(filepath.Join(dir, "after.yaml")) + require.NoError(t, err) + + sortMetrics(before) + normalizeTimestamps(before) + + require.Equal(t, before, after) +} diff --git a/internal/coreinternal/golden/normalize_timestamps.go b/internal/coreinternal/golden/normalize_timestamps.go new file mode 100644 index 000000000000..418336ce52dd --- /dev/null +++ b/internal/coreinternal/golden/normalize_timestamps.go @@ -0,0 +1,115 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package golden // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/golden" + +import ( + "sort" + "time" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil" +) + +func normalizeTimestamps(metrics pmetric.Metrics) { + rms := metrics.ResourceMetrics() + for i := 0; i < rms.Len(); i++ { + for j := 0; j < rms.At(i).ScopeMetrics().Len(); j++ { + for k := 0; k < rms.At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { + m := rms.At(i).ScopeMetrics().At(j).Metrics().At(k) + //exhaustive:enforce + switch m.Type() { + case pmetric.MetricTypeGauge: + normalizeDataPointSlice(dataPointSlice[pmetric.NumberDataPoint](m.Gauge().DataPoints())) + case pmetric.MetricTypeSum: + normalizeDataPointSlice(dataPointSlice[pmetric.NumberDataPoint](m.Sum().DataPoints())) + case pmetric.MetricTypeHistogram: + normalizeDataPointSlice(dataPointSlice[pmetric.HistogramDataPoint](m.Histogram().DataPoints())) + case pmetric.MetricTypeExponentialHistogram: + normalizeDataPointSlice(dataPointSlice[pmetric.ExponentialHistogramDataPoint](m.ExponentialHistogram().DataPoints())) + case pmetric.MetricTypeSummary: + normalizeDataPointSlice(dataPointSlice[pmetric.SummaryDataPoint](m.Summary().DataPoints())) + } + } + } + } +} + +// returns a map of the original timestamps with their corresponding normalized values. +// normalization entails setting nonunique subsequent timestamps to the same value while incrementing unique timestamps by a set value of 1,000,000 ns +func normalizeTimeSeries(timeSeries []pcommon.Timestamp) map[pcommon.Timestamp]pcommon.Timestamp { + sort.Slice(timeSeries, func(i, j int) bool { + return func(t1, t2 pcommon.Timestamp) int { + if t1 < t2 { + return -1 + } else if t1 > t2 { + return 1 + } + return 0 + }(timeSeries[i], timeSeries[j]) < 0 + }) + + // normalize values + normalizedTs := make(map[pcommon.Timestamp]pcommon.Timestamp) + count := 0 + for _, v := range timeSeries { + if v == 0 { + continue + } + if _, ok := normalizedTs[v]; !ok { + normalizedTs[v] = normalTime(count) + count++ + } + } + + return normalizedTs +} + +func normalTime(timeSeriesIndex int) pcommon.Timestamp { + return pcommon.NewTimestampFromTime(time.Unix(0, 0).Add(time.Duration(timeSeriesIndex+1) * 1000000 * time.Nanosecond)) +} + +type dataPointSlice[T dataPoint] interface { + Len() int + At(i int) T +} + +type dataPoint interface { + pmetric.NumberDataPoint | pmetric.HistogramDataPoint | pmetric.ExponentialHistogramDataPoint | pmetric.SummaryDataPoint + Attributes() pcommon.Map + StartTimestamp() pcommon.Timestamp + SetStartTimestamp(pcommon.Timestamp) + Timestamp() pcommon.Timestamp + SetTimestamp(pcommon.Timestamp) +} + +func normalizeDataPointSlice[T dataPoint](dps dataPointSlice[T]) { + attrCache := make(map[[16]byte]bool) + for i := 0; i < dps.Len(); i++ { + attrHash := pdatautil.MapHash(dps.At(i).Attributes()) + if attrCache[attrHash] { + continue + } + timeSeries := []pcommon.Timestamp{dps.At(i).StartTimestamp(), dps.At(i).Timestamp()} + + // Find any other data points in the time series + for j := i + 1; j < dps.Len(); j++ { + if pdatautil.MapHash(dps.At(j).Attributes()) != attrHash { + continue + } + timeSeries = append(timeSeries, dps.At(j).StartTimestamp(), dps.At(j).Timestamp()) + } + + normalizedTs := normalizeTimeSeries(timeSeries) + for k := 0; k < dps.Len(); k++ { + if pdatautil.MapHash(dps.At(k).Attributes()) != attrHash { + continue + } + dps.At(k).SetTimestamp(normalizedTs[dps.At(k).Timestamp()]) + dps.At(k).SetStartTimestamp(normalizedTs[dps.At(k).StartTimestamp()]) + } + attrCache[attrHash] = true + } +} diff --git a/internal/coreinternal/golden/normalize_timestamps_test.go b/internal/coreinternal/golden/normalize_timestamps_test.go new file mode 100644 index 000000000000..5e403b6d90e7 --- /dev/null +++ b/internal/coreinternal/golden/normalize_timestamps_test.go @@ -0,0 +1,22 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package golden // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/golden" + +import ( + "path/filepath" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestNormalizeTimestamps(t *testing.T) { + dir := filepath.Join("testdata", "timestamp-norm") + before, err := ReadMetrics(filepath.Join(dir, "before_normalize.yaml")) + require.NoError(t, err) + after, err := ReadMetrics(filepath.Join(dir, "after_normalize.yaml")) + require.NoError(t, err) + normalizeTimestamps(before) + + require.Equal(t, before, after) +} diff --git a/internal/coreinternal/golden/sort_metrics.go b/internal/coreinternal/golden/sort_metrics.go index 3ce53ee4e1be..212b6ab2fe65 100644 --- a/internal/coreinternal/golden/sort_metrics.go +++ b/internal/coreinternal/golden/sort_metrics.go @@ -23,6 +23,7 @@ func sortMetrics(ms pmetric.Metrics) { metricsList := ilms.At(j).Metrics() for k := 0; k < metricsList.Len(); k++ { metric := metricsList.At(k) + //exhaustive:enforce switch metricsList.At(k).Type() { case pmetric.MetricTypeGauge: ds := metric.Gauge().DataPoints() @@ -98,6 +99,7 @@ func sortMetricDataPointSlices(ms pmetric.Metrics) { for j := 0; j < ms.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ { for k := 0; k < ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { m := ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k) + //exhaustive:enforce switch m.Type() { case pmetric.MetricTypeGauge: sortNumberDataPointSlice(m.Gauge().DataPoints()) diff --git a/internal/coreinternal/golden/testdata/roundtrip/expected.yaml b/internal/coreinternal/golden/testdata/roundtrip/expected.yaml index 43646d69cb75..c39dae00ba0c 100644 --- a/internal/coreinternal/golden/testdata/roundtrip/expected.yaml +++ b/internal/coreinternal/golden/testdata/roundtrip/expected.yaml @@ -13,7 +13,7 @@ resourceMetrics: - key: testKey2 value: stringValue: testvalue1 - timeUnixNano: "11651379494838206464" + timeUnixNano: "1000000" - asDouble: 2 attributes: - key: testKey1 @@ -22,7 +22,7 @@ resourceMetrics: - key: testKey2 value: stringValue: testvalue2 - timeUnixNano: "11651379494838206464" + timeUnixNano: "1000000" name: test gauge multi unit: "1" - description: single gauge @@ -33,7 +33,7 @@ resourceMetrics: - key: testKey2 value: stringValue: teststringvalue2 - timeUnixNano: "11651379494838206464" + timeUnixNano: "1000000" name: test gauge single unit: By - description: multi sum @@ -46,13 +46,13 @@ resourceMetrics: - key: testKey2 value: stringValue: teststringvalue2 - timeUnixNano: "11651379494838206464" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: testKey2 value: stringValue: teststringvalue2 - timeUnixNano: "11651379494838206464" + timeUnixNano: "1000000" unit: s - description: single sum name: test cumulative sum single @@ -60,7 +60,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asDouble: 2 - timeUnixNano: "869965261000000001" + timeUnixNano: "1000000" isMonotonic: true unit: 1/s scope: {} diff --git a/internal/coreinternal/golden/testdata/standardize-metrics/after.yaml b/internal/coreinternal/golden/testdata/standardize-metrics/after.yaml new file mode 100644 index 000000000000..76159535c1c2 --- /dev/null +++ b/internal/coreinternal/golden/testdata/standardize-metrics/after.yaml @@ -0,0 +1,203 @@ +resourceMetrics: + - resource: + attributes: + - key: a + value: + stringValue: AAAA + scopeMetrics: + - metrics: + - description: Yet another fake metric for test + name: storage.amplitude + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "30" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "4000000" + - asInt: "10" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "3000000" + - asInt: "30" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: a + value: + stringValue: BBBB + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "0" + attributes: + - key: d + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: "1" + scope: + attributes: + - key: a + value: + stringValue: AAA + name: otelcol/FakeMetric + version: latest + - metrics: + - description: Fake Metric + name: storage.amplitude + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "3000000" + - asInt: "0" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: "1" + scope: + attributes: + - key: a + value: + stringValue: CCCC + name: otelcol/anotherfakereceiver + version: latest + - resource: + attributes: + - key: a + value: + stringValue: BBB + scopeMetrics: + - metrics: + - description: Sort + Timestamp normalization (full standardize) + name: test.b + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "3" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + - asInt: "1" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1000000" + timeUnixNano: "4000000" + - asInt: "6" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "2000000" + timeUnixNano: "5000000" + - asInt: "4" + attributes: + - key: a + value: + stringValue: b + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "2" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "4" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "5" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + isMonotonic: true + unit: By + - description: Sort + Timestamp normalization (full standardize) second test + name: test.a + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1000000" + timeUnixNano: "4000000" + - asInt: "3" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + - asInt: "6" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "2000000" + timeUnixNano: "5000000" + - asInt: "2" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "4" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + - asInt: "5" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + isMonotonic: true + unit: By + scope: + attributes: + - key: b + value: + stringValue: BBB + name: otelcol/standardization + version: latest diff --git a/internal/coreinternal/golden/testdata/standardize-metrics/before.yaml b/internal/coreinternal/golden/testdata/standardize-metrics/before.yaml new file mode 100644 index 000000000000..deed1bf116d5 --- /dev/null +++ b/internal/coreinternal/golden/testdata/standardize-metrics/before.yaml @@ -0,0 +1,205 @@ +resourceMetrics: + - resource: + attributes: + - key: a + value: + stringValue: BBB + scopeMetrics: + - metrics: + - description: Sort + Timestamp normalization (full standardize) + name: test.b + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "3333333333333333333" + timeUnixNano: "2222222222222222222" + - asInt: "3" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + - asInt: "4" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "1111111111111111111" + - asInt: "4" + attributes: + - key: a + value: + stringValue: b + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "4444444444444444444" + - asInt: "5" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "7777777777777777777" + - asInt: "1" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1111111111111111111" + timeUnixNano: "5555555555555555555" + - asInt: "6" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + isMonotonic: true + unit: By + - description: Sort + Timestamp normalization (full standardize) second test + name: test.a + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1111111111111111111" + timeUnixNano: "5555555555555555555" + - asInt: "2" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "3333333333333333333" + timeUnixNano: "2222222222222222222" + - asInt: "3" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + - asInt: "4" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888883333333333333" + - asInt: "5" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "1111111111111111111" + - asInt: "6" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + isMonotonic: true + unit: By + scope: + attributes: + - key: b + value: + stringValue: BBB + name: otelcol/standardization + version: latest + - resource: + attributes: + - key: a + value: + stringValue: AAAA + scopeMetrics: + - metrics: + - description: Fake Metric + name: storage.amplitude + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "9999999999999999999" + - asInt: "0" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + isMonotonic: false + unit: "1" + scope: + name: otelcol/anotherfakereceiver + version: latest + attributes: + - key: a + value: + stringValue: CCCC + - metrics: + - description: Yet another fake metric for test + name: storage.amplitude + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: d + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "4444444444444444444" + - asInt: "0" + attributes: + - key: a + value: + stringValue: BBBB + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "1111111111111111111" + - asInt: "30" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "9999999999999999999" + - asInt: "10" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + - asInt: "30" + attributes: + - key: a + value: + stringValue: AAAA + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + isMonotonic: false + unit: "1" + scope: + name: otelcol/FakeMetric + version: latest + attributes: + - key: a + value: + stringValue: AAA diff --git a/internal/coreinternal/golden/testdata/timestamp-norm/after_normalize.yaml b/internal/coreinternal/golden/testdata/timestamp-norm/after_normalize.yaml new file mode 100644 index 000000000000..e68943375c46 --- /dev/null +++ b/internal/coreinternal/golden/testdata/timestamp-norm/after_normalize.yaml @@ -0,0 +1,95 @@ +resourceMetrics: + - resource: + scopeMetrics: + - metrics: + - description: Timestamp normalization with attributes + name: test.first + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "3000000" + timeUnixNano: "4000000" + - asInt: "0" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "0" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1000000" + timeUnixNano: "5000000" + isMonotonic: true + unit: By + - description: Timestamp normalization without attributes + name: test.second + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "5000000" + - asInt: "1" + startTimeUnixNano: "4000000" + timeUnixNano: "4000000" + - asInt: "5" + startTimeUnixNano: "2000000" + timeUnixNano: "3000000" + - asInt: "10" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" + - asInt: "50" + startTimeUnixNano: "2000000" + timeUnixNano: "6000000" + isMonotonic: true + unit: By + - description: Timestamp normalization without startTimeUnixNano + name: test.second + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + timeUnixNano: "4000000" + - asInt: "1" + timeUnixNano: "3000000" + - asInt: "5" + timeUnixNano: "2000000" + - asInt: "10" + timeUnixNano: "1000000" + - asInt: "50" + timeUnixNano: "5000000" + isMonotonic: true + unit: By + scope: + name: otelcol/timestampNormalization + version: latest diff --git a/internal/coreinternal/golden/testdata/timestamp-norm/before_normalize.yaml b/internal/coreinternal/golden/testdata/timestamp-norm/before_normalize.yaml new file mode 100644 index 000000000000..da118b02fae5 --- /dev/null +++ b/internal/coreinternal/golden/testdata/timestamp-norm/before_normalize.yaml @@ -0,0 +1,96 @@ +resourceMetrics: + - resource: + scopeMetrics: + - metrics: + - description: Timestamp normalization with attributes + name: test.first + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "3333333333333333333" + timeUnixNano: "5555555555555555555" + - asInt: "0" + attributes: + - key: b + value: + stringValue: b + startTimeUnixNano: "3333333333333333333" + timeUnixNano: "2222222222222222222" + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + - asInt: "0" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "1111111111111111111" + - asInt: "0" + attributes: + - key: d + value: + stringValue: d + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + - asInt: "0" + attributes: + - key: a + value: + stringValue: a + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + isMonotonic: true + unit: By + - description: Timestamp normalization without attributes + name: test.second + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1111111111111111111" + timeUnixNano: "5555555555555555555" + - asInt: "1" + startTimeUnixNano: "3333333333333333333" + timeUnixNano: "3333333333333333333" + - asInt: "5" + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "2222222222222222222" + - asInt: "10" + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "1111111111111111111" + - asInt: "50" + startTimeUnixNano: "1924857624581089658" + timeUnixNano: "8888888888888888888" + isMonotonic: true + unit: By + - description: Timestamp normalization without startTimeUnixNano + name: test.second + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + timeUnixNano: "5555555555555555555" + - asInt: "1" + timeUnixNano: "3333333333333333333" + - asInt: "5" + timeUnixNano: "2222222222222222222" + - asInt: "10" + timeUnixNano: "1111111111111111111" + - asInt: "50" + timeUnixNano: "8888888888888888888" + isMonotonic: true + unit: By + scope: + name: otelcol/timestampNormalization + version: latest + \ No newline at end of file diff --git a/internal/coreinternal/goldendataset/metrics_gen.go b/internal/coreinternal/goldendataset/metrics_gen.go index ed92203780ef..044cde1606ff 100644 --- a/internal/coreinternal/goldendataset/metrics_gen.go +++ b/internal/coreinternal/goldendataset/metrics_gen.go @@ -109,6 +109,7 @@ func (g *metricGenerator) populateMetrics(cfg MetricsCfg, ilm pmetric.ScopeMetri for i := 0; i < cfg.NumMetricsPerILM; i++ { metric := metrics.AppendEmpty() g.populateMetricDesc(cfg, metric) + //exhaustive:enforce switch cfg.MetricDescriptorType { case pmetric.MetricTypeGauge: populateNumberPoints(cfg, metric.SetEmptyGauge().DataPoints()) @@ -125,6 +126,8 @@ func (g *metricGenerator) populateMetrics(cfg MetricsCfg, ilm pmetric.ScopeMetri histo := metric.SetEmptyExponentialHistogram() histo.SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) populateExpoHistogram(cfg, histo) + case pmetric.MetricTypeSummary: + panic("unsupported type summary") } } } diff --git a/internal/coreinternal/goldendataset/pict_metrics_gen.go b/internal/coreinternal/goldendataset/pict_metrics_gen.go index d926b88de210..c23db493264b 100644 --- a/internal/coreinternal/goldendataset/pict_metrics_gen.go +++ b/internal/coreinternal/goldendataset/pict_metrics_gen.go @@ -16,7 +16,7 @@ func GenerateMetrics(metricPairsFile string) ([]pmetric.Metrics, error) { if err != nil { return nil, err } - var out []pmetric.Metrics + out := make([]pmetric.Metrics, 0, len(pictData)) for i, values := range pictData { if i == 0 { continue diff --git a/internal/coreinternal/metricstestutil/metric_diff.go b/internal/coreinternal/metricstestutil/metric_diff.go index 89b52aecc481..0f4b3400cc19 100644 --- a/internal/coreinternal/metricstestutil/metric_diff.go +++ b/internal/coreinternal/metricstestutil/metric_diff.go @@ -110,6 +110,7 @@ func DiffMetric(diffs []*MetricDiff, expected pmetric.Metric, actual pmetric.Met if mismatch { return diffs } + //exhaustive:enforce switch actual.Type() { case pmetric.MetricTypeGauge: diffs = diffNumberPts(diffs, expected.Gauge().DataPoints(), actual.Gauge().DataPoints()) @@ -123,8 +124,10 @@ func DiffMetric(diffs []*MetricDiff, expected pmetric.Metric, actual pmetric.Met case pmetric.MetricTypeExponentialHistogram: diffs = diff(diffs, expected.ExponentialHistogram().AggregationTemporality(), actual.ExponentialHistogram().AggregationTemporality(), "ExponentialHistogram AggregationTemporality") diffs = diffExponentialHistogramPts(diffs, expected.ExponentialHistogram().DataPoints(), actual.ExponentialHistogram().DataPoints()) - default: + case pmetric.MetricTypeSummary: // Note: Summary data points are not currently handled + panic("unsupported test case for summary data") + default: panic("unsupported test case") } return diffs diff --git a/internal/coreinternal/testdata/metric.go b/internal/coreinternal/testdata/metric.go index 68f44e518839..031720e3e577 100644 --- a/internal/coreinternal/testdata/metric.go +++ b/internal/coreinternal/testdata/metric.go @@ -268,6 +268,7 @@ func initMetric(m pmetric.Metric, name string, ty pmetric.MetricType) { m.SetName(name) m.SetDescription("") m.SetUnit("1") + //exhaustive:enforce switch ty { case pmetric.MetricTypeGauge: m.SetEmptyGauge() diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index bfe26563af0f..6890535b091e 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -35,7 +35,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 9c3c948ce975..ebb1ade736d4 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -72,8 +72,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/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/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= diff --git a/internal/filter/filterexpr/matcher.go b/internal/filter/filterexpr/matcher.go index 225846618f5d..f85f2c0dff68 100644 --- a/internal/filter/filterexpr/matcher.go +++ b/internal/filter/filterexpr/matcher.go @@ -51,6 +51,7 @@ func (m *Matcher) MatchMetric(metric pmetric.Metric) (bool, error) { metricName := metric.Name() vm := vmPool.Get().(*vm.VM) defer vmPool.Put(vm) + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: return m.matchGauge(metricName, metric.Gauge(), vm) diff --git a/internal/filter/filterottl/functions.go b/internal/filter/filterottl/functions.go index be36b3999861..ef08af2527b3 100644 --- a/internal/filter/filterottl/functions.go +++ b/internal/filter/filterottl/functions.go @@ -120,6 +120,7 @@ func hasAttributeKeyOnDatapoint(key string) (ottl.ExprFunc[ottlmetric.TransformC func checkDataPoints(tCtx ottlmetric.TransformContext, key string, expectedVal *string) (interface{}, error) { metric := tCtx.GetMetric() + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeSum: return checkNumberDataPointSlice(metric.Sum().DataPoints(), key, expectedVal), nil diff --git a/internal/filter/go.mod b/internal/filter/go.mod index bd5a6305ef53..8c35390b4714 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -24,7 +24,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index 0aacb40e1167..6fb04ba07191 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -106,8 +106,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/internal/k8sconfig/go.mod b/internal/k8sconfig/go.mod index 860cf114706c..acd554aec56d 100644 --- a/internal/k8sconfig/go.mod +++ b/internal/k8sconfig/go.mod @@ -20,7 +20,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/internal/k8sconfig/go.sum b/internal/k8sconfig/go.sum index 5c62a78df44d..a00f126379b0 100644 --- a/internal/k8sconfig/go.sum +++ b/internal/k8sconfig/go.sum @@ -132,8 +132,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 847267773110..d611c051c158 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -8,7 +8,7 @@ require ( github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/config/configtls v0.83.0 go.uber.org/zap v1.25.0 - k8s.io/client-go v0.27.4 + k8s.io/client-go v0.28.1 ) require ( @@ -17,14 +17,14 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // 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/google/gnostic v0.5.7-v3refs // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -49,11 +49,11 @@ require ( 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.27.4 // indirect - k8s.io/apimachinery v0.27.4 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/api v0.28.1 // indirect + k8s.io/apimachinery v0.28.1 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index a31f4d7d5632..506ceda65dd8 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -72,15 +72,15 @@ github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= 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-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -105,13 +105,12 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq 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.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/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 v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +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= 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= @@ -135,8 +134,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -162,7 +161,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -191,10 +190,10 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/openshift/api v0.0.0-20180801171038-322a19404e37 h1:05irGU4HK4IauGGDbsk+ZHrm1wOzMLYjMlfaiqMrBYc= github.com/openshift/api v0.0.0-20180801171038-322a19404e37/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= @@ -207,19 +206,17 @@ 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 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.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -402,7 +399,7 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY 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.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= 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= @@ -443,7 +440,6 @@ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -459,7 +455,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -484,7 +479,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -494,28 +488,28 @@ 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.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= 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.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/internal/metadataproviders/go.mod b/internal/metadataproviders/go.mod index dfbea1de0f95..475a75396a65 100644 --- a/internal/metadataproviders/go.mod +++ b/internal/metadataproviders/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/Showmax/go-fqdn v1.0.0 - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/docker/docker v24.0.5+incompatible github.com/hashicorp/consul/api v1.24.0 github.com/stretchr/testify v1.8.4 diff --git a/internal/metadataproviders/go.sum b/internal/metadataproviders/go.sum index b2248a5d35cc..662f2480af49 100644 --- a/internal/metadataproviders/go.sum +++ b/internal/metadataproviders/go.sum @@ -15,8 +15,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 73cc399a5957..96374b859b7a 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -15,8 +15,8 @@ require ( go.opentelemetry.io/build-tools/issuegenerator v0.11.0 go.opentelemetry.io/build-tools/multimod v0.11.0 go.opentelemetry.io/collector/cmd/builder v0.83.0 - golang.org/x/tools v0.12.0 - golang.org/x/vuln v1.0.0 + golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 + golang.org/x/vuln v1.0.1 ) require ( diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 8cec6624c2bc..77d923fd17ef 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -1074,10 +1074,10 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= 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.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= -golang.org/x/vuln v1.0.0 h1:tYLAU3jD9LQr98Y+3el06lWyGMCnvzw06PIWP3LIy7g= -golang.org/x/vuln v1.0.0/go.mod h1:V0eyhHwaAaHrt42J9bgrN6rd12f6GU4T0Lu0ex2wDg4= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/vuln v1.0.1 h1:KUas02EjQK5LTuIx1OylBQdKKZ9jeugs+HiqO5HormU= +golang.org/x/vuln v1.0.1/go.mod h1:bb2hMwln/tqxg32BNY4CcxHWtHXuYa3SbIBmtsyjxtM= 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= diff --git a/pkg/ottl/expression.go b/pkg/ottl/expression.go index 82e9b0407ebc..47f38dc99415 100644 --- a/pkg/ottl/expression.go +++ b/pkg/ottl/expression.go @@ -9,6 +9,7 @@ import ( "fmt" "reflect" "strconv" + "time" jsoniter "github.com/json-iterator/go" "go.opentelemetry.io/collector/pdata/pcommon" @@ -581,3 +582,33 @@ func (p *Parser[K]) newGetterFromConverter(c converter) (Getter[K], error) { keys: c.Keys, }, nil } + +// DurationGetter is a Getter that must return an time.Duration. +type DurationGetter[K any] interface { + // Get retrieves an int64 value. + Get(ctx context.Context, tCtx K) (time.Duration, error) +} + +// StandardDurationGetter is a basic implementation of DurationGetter +type StandardDurationGetter[K any] struct { + Getter func(ctx context.Context, tCtx K) (interface{}, error) +} + +// Get retrieves an time.Duration value. +// If the value is not an time.Duration a new TypeError is returned. +// If there is an error getting the value it will be returned. +func (g StandardDurationGetter[K]) Get(ctx context.Context, tCtx K) (time.Duration, error) { + val, err := g.Getter(ctx, tCtx) + if err != nil { + return 0, fmt.Errorf("error getting value in %T: %w", g, err) + } + if val == nil { + return 0, TypeError("expected duration but got nil") + } + switch v := val.(type) { + case time.Duration: + return v, nil + default: + return 0, TypeError(fmt.Sprintf("expected duration but got %T", val)) + } +} diff --git a/pkg/ottl/expression_test.go b/pkg/ottl/expression_test.go index b9d2451e81aa..304d37f9ce3a 100644 --- a/pkg/ottl/expression_test.go +++ b/pkg/ottl/expression_test.go @@ -7,8 +7,10 @@ import ( "context" "fmt" "testing" + "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" @@ -1550,3 +1552,108 @@ func Test_StandardPMapGetter_WrappedError(t *testing.T) { _, ok := err.(TypeError) assert.False(t, ok) } + +func Test_StandardDurationGetter(t *testing.T) { + oneHourOneMinuteOneSecond, err := time.ParseDuration("1h1m1s") + require.NoError(t, err) + + oneHundredNsecs, err := time.ParseDuration("100ns") + require.NoError(t, err) + + tenMilliseconds, err := time.ParseDuration("10ms66us7000ns") + require.NoError(t, err) + + tests := []struct { + name string + getter StandardDurationGetter[interface{}] + want interface{} + valid bool + expectedErrorMsg string + }{ + { + name: "complex duration", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h1m1s") + }, + }, + want: oneHourOneMinuteOneSecond, + valid: true, + }, + { + name: "simple duration", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100ns") + }, + }, + want: oneHundredNsecs, + valid: true, + }, + { + name: "complex duation values less than 1 seconc", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("10ms66us7000ns") + }, + }, + want: tenMilliseconds, + valid: true, + }, + { + name: "invalid duration units", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("70ps") + }, + }, + valid: false, + expectedErrorMsg: "unknown unit", + }, + { + name: "wrong type - int", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return 1, nil + }, + }, + valid: false, + expectedErrorMsg: "expected duration but got int", + }, + { + name: "nil", + getter: StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return nil, nil + }, + }, + valid: false, + expectedErrorMsg: "expected duration but got nil", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + val, err := tt.getter.Get(context.Background(), nil) + if tt.valid { + assert.NoError(t, err) + assert.Equal(t, tt.want, val) + } else { + assert.ErrorContains(t, err, tt.expectedErrorMsg) + } + }) + } +} + +// nolint:errorlint +func Test_StandardDurationGetter_WrappedError(t *testing.T) { + getter := StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return nil, TypeError("") + }, + } + _, err := getter.Get(context.Background(), nil) + assert.Error(t, err) + _, ok := err.(TypeError) + assert.False(t, ok) +} diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 1899ceeaf4ce..bd6a87061506 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/alecthomas/participle/v2 v2.0.0 github.com/gobwas/glob v0.2.3 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/iancoleman/strcase v0.3.0 github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 8da71bf8ff55..d618a341d5fb 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -100,8 +100,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/pkg/ottl/ottlfuncs/README.md b/pkg/ottl/ottlfuncs/README.md index 6cdf1e2486a1..fe82c55b76d6 100644 --- a/pkg/ottl/ottlfuncs/README.md +++ b/pkg/ottl/ottlfuncs/README.md @@ -277,6 +277,7 @@ Unlike functions, they do not modify any input telemetry and always return a val Available Converters: - [Concat](#concat) - [ConvertCase](#convertcase) +- [ExtractPatterns](#extractpatterns) - [FNV](#fnv) - [Duration](#duration) - [Int](#int) @@ -353,6 +354,22 @@ Examples: - `Duration("333ms")` - `Duration("1000000h")` +### ExtractPatterns + +`ExtractPatterns(target, pattern)` + +The `ExtractPatterns` Converter returns a `pcommon.Map` struct that is a result of extracting named capture groups from the target string. If not matches are found then an empty `pcommon.Map` is returned. + +`target` is a Getter that returns a string. `pattern` is a regex string. + +If `target` is not a string or nil `ExtractPatterns` will return an error. If `pattern` does not contain at least 1 named capture group then `ExtractPatterns` will error on startup. + +Examples: + +- `ExtractPatterns(attributes["k8s.change_cause"], "GIT_SHA=(?P\w+)")` + +- `ExtractPatterns(body, "^(?P\\w+ \\w+ [0-9]+:[0-9]+:[0-9]+) (?P([A-Za-z0-9-_]+)) (?P\\w+)(\\[(?P\\d+)\\])?: (?P.*)$")` + ### FNV `FNV(value)` diff --git a/pkg/ottl/ottlfuncs/func_duration_hours.go b/pkg/ottl/ottlfuncs/func_duration_hours.go new file mode 100644 index 000000000000..bec1cf466d96 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_hours.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type HoursArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewHoursFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Hours", &HoursArguments[K]{}, createHoursFunction[K]) +} +func createHoursFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*HoursArguments[K]) + + if !ok { + return nil, fmt.Errorf("HoursFactory args must be of type *HoursArguments[K]") + } + + return Hours(args.Duration) +} + +func Hours[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Hours(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_hours_test.go b/pkg/ottl/ottlfuncs/func_duration_hours_test.go new file mode 100644 index 000000000000..e8fe9af871ac --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_hours_test.go @@ -0,0 +1,68 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Hours(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected float64 + }{ + { + name: "100 hours", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100h") + }, + }, + expected: 100, + }, + { + name: "1 min", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100m") + }, + }, + expected: 1.6666666666666665, + }, + { + name: "234 milliseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("234ms") + }, + }, + expected: 0.000065, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds 100 microseconds 1 nanosecond", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms100us1ns") + }, + }, + expected: 1.667508361111389, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Hours(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_duration_micro.go b/pkg/ottl/ottlfuncs/func_duration_micro.go new file mode 100644 index 000000000000..ec089a7c8184 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_micro.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type MicrosecondsArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewMicrosecondsFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Microseconds", &MicrosecondsArguments[K]{}, createMicrosecondsFunction[K]) +} +func createMicrosecondsFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*MicrosecondsArguments[K]) + + if !ok { + return nil, fmt.Errorf("MicrosecondsFactory args must be of type *MicrosecondsArguments[K]") + } + + return Microseconds(args.Duration) +} + +func Microseconds[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Microseconds(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_micro_test.go b/pkg/ottl/ottlfuncs/func_duration_micro_test.go new file mode 100644 index 000000000000..7e3c9b8c66be --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_micro_test.go @@ -0,0 +1,68 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Microseconds(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected int64 + }{ + { + name: "100 microseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100us") + }, + }, + expected: 100, + }, + { + name: "1000 hour", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100h") + }, + }, + expected: 360000000000, + }, + { + name: "50 mins", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("50m") + }, + }, + expected: 3000000000, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds 100 microseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms100us") + }, + }, + expected: 6003030100, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Microseconds(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_duration_milli.go b/pkg/ottl/ottlfuncs/func_duration_milli.go new file mode 100644 index 000000000000..dee4d27c4730 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_milli.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type MillisecondsArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewMillisecondsFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Milliseconds", &MillisecondsArguments[K]{}, createMillisecondsFunction[K]) +} +func createMillisecondsFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*MillisecondsArguments[K]) + + if !ok { + return nil, fmt.Errorf("MillisecondsFactory args must be of type *MillisecondsArguments[K]") + } + + return Milliseconds(args.Duration) +} + +func Milliseconds[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Milliseconds(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_milli_test.go b/pkg/ottl/ottlfuncs/func_duration_milli_test.go new file mode 100644 index 000000000000..4f8f95e57cc0 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_milli_test.go @@ -0,0 +1,68 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Milliseconds(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected int64 + }{ + { + name: "100 Milliseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100ms") + }, + }, + expected: 100, + }, + { + name: "1000 hour", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100h") + }, + }, + expected: 360000000, + }, + { + name: "47 mins", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("47m") + }, + }, + expected: 2820000, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms") + }, + }, + expected: 6003030, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Milliseconds(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_duration_minutes.go b/pkg/ottl/ottlfuncs/func_duration_minutes.go new file mode 100644 index 000000000000..d62cd4ecf2f2 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_minutes.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type MinutesArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewMinutesFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Minutes", &MinutesArguments[K]{}, createMinutesFunction[K]) +} +func createMinutesFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*MinutesArguments[K]) + + if !ok { + return nil, fmt.Errorf("MinutesFactory args must be of type *MinutesArguments[K]") + } + + return Minutes(args.Duration) +} + +func Minutes[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Minutes(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_minutes_test.go b/pkg/ottl/ottlfuncs/func_duration_minutes_test.go new file mode 100644 index 000000000000..687078007335 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_minutes_test.go @@ -0,0 +1,68 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Minutes(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected float64 + }{ + { + name: "100 minutes", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100m") + }, + }, + expected: 100, + }, + { + name: "1 hour", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h") + }, + }, + expected: 60, + }, + { + name: "234 milliseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("234ms") + }, + }, + expected: 0.0039, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds 100 microseconds 1 nanosecond", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms100us1ns") + }, + }, + expected: 100.05050166668333, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Minutes(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_duration_nano.go b/pkg/ottl/ottlfuncs/func_duration_nano.go new file mode 100644 index 000000000000..9d31fb846ec6 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_nano.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type NanosecondsArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewNanosecondsFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Nanoseconds", &NanosecondsArguments[K]{}, createNanosecondsFunction[K]) +} +func createNanosecondsFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*NanosecondsArguments[K]) + + if !ok { + return nil, fmt.Errorf("NanosecondsFactory args must be of type *NanosecondsArguments[K]") + } + + return Nanoseconds(args.Duration) +} + +func Nanoseconds[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Nanoseconds(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_nano_test.go b/pkg/ottl/ottlfuncs/func_duration_nano_test.go new file mode 100644 index 000000000000..395743c84b10 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_nano_test.go @@ -0,0 +1,68 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Nanoseconds(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected int64 + }{ + { + name: "100 nanoseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100ns") + }, + }, + expected: 100, + }, + { + name: "1 hour", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100h") + }, + }, + expected: 360000000000000, + }, + { + name: "23 mins", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("23m") + }, + }, + expected: 1380000000000, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds 100 microseconds 1 nanosecond", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms100us1ns") + }, + }, + expected: 6003030100001, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Nanoseconds(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_duration_seconds.go b/pkg/ottl/ottlfuncs/func_duration_seconds.go new file mode 100644 index 000000000000..403d68d99bb5 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_seconds.go @@ -0,0 +1,38 @@ +// 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" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type SecondsArguments[K any] struct { + Duration ottl.DurationGetter[K] `ottlarg:"0"` +} + +func NewSecondsFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("Seconds", &SecondsArguments[K]{}, createSecondsFunction[K]) +} +func createSecondsFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*SecondsArguments[K]) + + if !ok { + return nil, fmt.Errorf("SecondsFactory args must be of type *SecondsArguments[K]") + } + + return Seconds(args.Duration) +} + +func Seconds[K any](duration ottl.DurationGetter[K]) (ottl.ExprFunc[K], error) { + return func(ctx context.Context, tCtx K) (interface{}, error) { + d, err := duration.Get(ctx, tCtx) + if err != nil { + return nil, err + } + return d.Seconds(), nil + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_duration_seconds_test.go b/pkg/ottl/ottlfuncs/func_duration_seconds_test.go new file mode 100644 index 000000000000..c8d7f72ca1b4 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_duration_seconds_test.go @@ -0,0 +1,77 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +func Test_Seconds(t *testing.T) { + tests := []struct { + name string + duration ottl.DurationGetter[interface{}] + expected float64 + }{ + { + name: "100 seconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100s") + }, + }, + expected: 100, + }, + { + name: "1 hour", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("100h") + }, + }, + expected: 360000, + }, + { + name: "11 mins", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("11m") + }, + }, + expected: 660, + }, + { + name: "50 microseconds", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("11us") + }, + }, + expected: 0.000011, + }, + { + name: "1 hour 40 mins 3 seconds 30 milliseconds 100 microseconds 1 nanosecond", + duration: &ottl.StandardDurationGetter[interface{}]{ + Getter: func(ctx context.Context, tCtx interface{}) (interface{}, error) { + return time.ParseDuration("1h40m3s30ms100us1ns") + }, + }, + expected: 6003.030100001, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := Seconds(tt.duration) + assert.NoError(t, err) + result, err := exprFunc(nil, nil) + assert.NoError(t, err) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_extract_patterns.go b/pkg/ottl/ottlfuncs/func_extract_patterns.go new file mode 100644 index 000000000000..4101e8d9182f --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_extract_patterns.go @@ -0,0 +1,75 @@ +// 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" + "fmt" + "regexp" + + "go.opentelemetry.io/collector/pdata/pcommon" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + +type ExtractPatternsArguments[K any] struct { + Target ottl.StringGetter[K] `ottlarg:"0"` + Pattern string `ottlarg:"1"` +} + +func NewExtractPatternsFactory[K any]() ottl.Factory[K] { + return ottl.NewFactory("ExtractPatterns", &ExtractPatternsArguments[K]{}, createExtractPatternsFunction[K]) +} + +func createExtractPatternsFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { + args, ok := oArgs.(*ExtractPatternsArguments[K]) + + if !ok { + return nil, fmt.Errorf("ExtractPatternsFactory args must be of type *ExtractPatternsArguments[K]") + } + + return extractPatterns(args.Target, args.Pattern) +} + +func extractPatterns[K any](target ottl.StringGetter[K], pattern string) (ottl.ExprFunc[K], error) { + r, err := regexp.Compile(pattern) + if err != nil { + return nil, fmt.Errorf("the pattern supplied to ExtractPatterns is not a valid pattern: %w", err) + } + + namedCaptureGroups := 0 + for _, groupName := range r.SubexpNames() { + if groupName != "" { + namedCaptureGroups++ + } + } + + if namedCaptureGroups == 0 { + return nil, fmt.Errorf("at least 1 named capture group must be supplied in the given regex") + } + + return func(ctx context.Context, tCtx K) (interface{}, error) { + val, err := target.Get(ctx, tCtx) + if err != nil { + return nil, err + } + + matches := r.FindStringSubmatch(val) + if matches == nil { + return pcommon.NewMap(), nil + } + + result := pcommon.NewMap() + for i, subexp := range r.SubexpNames() { + if i == 0 { + // Skip whole match + continue + } + if subexp != "" { + result.PutStr(subexp, matches[i]) + } + } + return result, err + }, nil +} diff --git a/pkg/ottl/ottlfuncs/func_extract_patterns_test.go b/pkg/ottl/ottlfuncs/func_extract_patterns_test.go new file mode 100644 index 000000000000..d051eb1a8476 --- /dev/null +++ b/pkg/ottl/ottlfuncs/func_extract_patterns_test.go @@ -0,0 +1,140 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package ottlfuncs + +import ( + "context" + "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_extractPatterns(t *testing.T) { + target := &ottl.StandardStringGetter[any]{ + Getter: func(ctx context.Context, tCtx any) (interface{}, error) { + return `a=b c=d`, nil + }, + } + tests := []struct { + name string + target ottl.StringGetter[any] + pattern string + want func(pcommon.Map) + }{ + { + name: "extract patterns", + target: target, + pattern: `^a=(?P\w+)\s+c=(?P\w+)$`, + want: func(expectedMap pcommon.Map) { + expectedMap.PutStr("a", "b") + expectedMap.PutStr("c", "d") + }, + }, + { + name: "no pattern found", + target: target, + pattern: `^a=(?P\w+)$`, + want: func(expectedMap pcommon.Map) {}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := extractPatterns(tt.target, tt.pattern) + assert.NoError(t, err) + + result, err := exprFunc(context.Background(), nil) + assert.NoError(t, err) + + resultMap, ok := result.(pcommon.Map) + require.True(t, ok) + + expected := pcommon.NewMap() + tt.want(expected) + + assert.Equal(t, expected.Len(), resultMap.Len()) + expected.Range(func(k string, v pcommon.Value) bool { + ev, _ := expected.Get(k) + av, _ := resultMap.Get(k) + assert.Equal(t, ev, av) + return true + }) + }) + } +} + +func Test_extractPatterns_validation(t *testing.T) { + tests := []struct { + name string + target ottl.StringGetter[any] + pattern string + }{ + { + name: "bad regex", + target: &ottl.StandardStringGetter[any]{ + Getter: func(ctx context.Context, tCtx any) (interface{}, error) { + return "foobar", nil + }, + }, + pattern: "(", + }, + { + name: "no named capture group", + target: &ottl.StandardStringGetter[any]{ + Getter: func(ctx context.Context, tCtx any) (interface{}, error) { + return "foobar", nil + }, + }, + pattern: "(.*)", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := extractPatterns[any](tt.target, tt.pattern) + assert.Error(t, err) + assert.Nil(t, exprFunc) + }) + } +} + +func Test_extractPatterns_bad_input(t *testing.T) { + tests := []struct { + name string + target ottl.StringGetter[any] + pattern string + }{ + { + name: "target is non-string", + target: &ottl.StandardStringGetter[any]{ + Getter: func(ctx context.Context, tCtx any) (interface{}, error) { + return 123, nil + }, + }, + pattern: "(?P.*)", + }, + { + name: "target is nil", + target: &ottl.StandardStringGetter[any]{ + Getter: func(ctx context.Context, tCtx any) (interface{}, error) { + return nil, nil + }, + }, + pattern: "(?P.*)", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + exprFunc, err := extractPatterns[any](tt.target, tt.pattern) + assert.NoError(t, err) + + result, err := exprFunc(nil, nil) + assert.Error(t, err) + assert.Nil(t, result) + }) + } +} diff --git a/pkg/ottl/ottlfuncs/func_len.go b/pkg/ottl/ottlfuncs/func_len.go index 1766469035ff..a1d9e50940a2 100644 --- a/pkg/ottl/ottlfuncs/func_len.go +++ b/pkg/ottl/ottlfuncs/func_len.go @@ -9,12 +9,15 @@ import ( "reflect" "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/pkg/ottl" ) const ( - typeError = "target arg must be of type string, []any, map[string]any, pcommon.Map, pcommon.Slice, or pcommon.Value (of type String, Map, Slice)" + typeError = `target arg must be of type string, []any, map[string]any, pcommon.Map, pcommon.Slice, pcommon.Value (of type String, Map, Slice) or a supported slice type from the plog, pmetric or ptrace packages` ) type LenArguments[K any] struct { @@ -58,6 +61,43 @@ func computeLen[K any](target ottl.Getter[K]) ottl.ExprFunc[K] { return int64(valType.Len()), nil case pcommon.Slice: return int64(valType.Len()), nil + + case plog.LogRecordSlice: + return int64(valType.Len()), nil + case plog.ResourceLogsSlice: + return int64(valType.Len()), nil + case plog.ScopeLogsSlice: + return int64(valType.Len()), nil + + case pmetric.ExemplarSlice: + return int64(valType.Len()), nil + case pmetric.ExponentialHistogramDataPointSlice: + return int64(valType.Len()), nil + case pmetric.HistogramDataPointSlice: + return int64(valType.Len()), nil + case pmetric.MetricSlice: + return int64(valType.Len()), nil + case pmetric.NumberDataPointSlice: + return int64(valType.Len()), nil + case pmetric.ResourceMetricsSlice: + return int64(valType.Len()), nil + case pmetric.ScopeMetricsSlice: + return int64(valType.Len()), nil + case pmetric.SummaryDataPointSlice: + return int64(valType.Len()), nil + case pmetric.SummaryDataPointValueAtQuantileSlice: + return int64(valType.Len()), nil + + case ptrace.ResourceSpansSlice: + return int64(valType.Len()), nil + case ptrace.ScopeSpansSlice: + return int64(valType.Len()), nil + case ptrace.SpanEventSlice: + return int64(valType.Len()), nil + case ptrace.SpanLinkSlice: + return int64(valType.Len()), nil + case ptrace.SpanSlice: + return int64(valType.Len()), nil } v := reflect.ValueOf(val) diff --git a/pkg/ottl/ottlfuncs/func_len_test.go b/pkg/ottl/ottlfuncs/func_len_test.go index 3b28a43cb70a..7595c12a9ff1 100644 --- a/pkg/ottl/ottlfuncs/func_len_test.go +++ b/pkg/ottl/ottlfuncs/func_len_test.go @@ -10,6 +10,9 @@ import ( "github.com/stretchr/testify/assert" "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/pkg/ottl" ) @@ -39,6 +42,108 @@ func Test_Len(t *testing.T) { t.Error(err) } + plogLogRecordSlice := plog.NewLogRecordSlice() + plogLogRecordSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + plogLogRecordSlice.AppendEmpty() + } + + plogResourceLogsSlice := plog.NewResourceLogsSlice() + plogResourceLogsSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + plogResourceLogsSlice.AppendEmpty() + } + + plogScopeLogsSlice := plog.NewScopeLogsSlice() + for i := 0; i < 5; i++ { + plogScopeLogsSlice.AppendEmpty() + } + plogScopeLogsSlice.EnsureCapacity(5) + + pmetricExemplarSlice := pmetric.NewExemplarSlice() + pmetricExemplarSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricExemplarSlice.AppendEmpty() + } + + pmetricExponentialHistogramDataPointSlice := pmetric.NewExponentialHistogramDataPointSlice() + pmetricExponentialHistogramDataPointSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricExponentialHistogramDataPointSlice.AppendEmpty() + } + + pmetricHistogramDataPointSlice := pmetric.NewHistogramDataPointSlice() + pmetricHistogramDataPointSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricHistogramDataPointSlice.AppendEmpty() + } + + pmetricMetricSlice := pmetric.NewMetricSlice() + pmetricMetricSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricMetricSlice.AppendEmpty() + } + + pmetricNumberDataPointSlice := pmetric.NewNumberDataPointSlice() + pmetricNumberDataPointSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricNumberDataPointSlice.AppendEmpty() + } + + pmetricResourceSlice := pmetric.NewResourceMetricsSlice() + pmetricResourceSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricResourceSlice.AppendEmpty() + } + + pmetricScopeMetricsSlice := pmetric.NewScopeMetricsSlice() + pmetricScopeMetricsSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricScopeMetricsSlice.AppendEmpty() + } + + pmetricSummaryDataPointSlice := pmetric.NewSummaryDataPointSlice() + pmetricSummaryDataPointSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricSummaryDataPointSlice.AppendEmpty() + } + + pmetricSummaryDataPointValueAtQuantileSlice := pmetric.NewSummaryDataPointValueAtQuantileSlice() + pmetricSummaryDataPointValueAtQuantileSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + pmetricSummaryDataPointValueAtQuantileSlice.AppendEmpty() + } + + ptraceResourceSpansSlice := ptrace.NewResourceSpansSlice() + ptraceResourceSpansSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + ptraceResourceSpansSlice.AppendEmpty() + } + + ptraceScopeSpansSlice := ptrace.NewScopeSpansSlice() + ptraceScopeSpansSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + ptraceScopeSpansSlice.AppendEmpty() + } + + ptraceSpanEventSlice := ptrace.NewSpanEventSlice() + ptraceSpanEventSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + ptraceSpanEventSlice.AppendEmpty() + } + + ptraceSpanLinkSlice := ptrace.NewSpanLinkSlice() + ptraceSpanLinkSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + ptraceSpanLinkSlice.AppendEmpty() + } + + ptraceSpanSlice := ptrace.NewSpanSlice() + ptraceSpanSlice.EnsureCapacity(5) + for i := 0; i < 5; i++ { + ptraceSpanSlice.AppendEmpty() + } + tests := []struct { name string value interface{} @@ -89,6 +194,92 @@ func Test_Len(t *testing.T) { value: pcommonValueMap, expected: 5, }, + { + name: "plog LogRecord slice", + value: plogLogRecordSlice, + expected: 5, + }, + { + name: "plog ResourceLogs slice", + value: plogResourceLogsSlice, + expected: 5, + }, + { + name: "plog ScopeLogs slice", + value: plogScopeLogsSlice, + expected: 5, + }, + { + name: "pmetric Exemplar slice", + value: pmetricExemplarSlice, + expected: 5, + }, + { + name: "pmetric ExponentialHistogramDataPoint slice", + value: pmetricExponentialHistogramDataPointSlice, + expected: 5, + }, + { + name: "pmetric HistogramDataPoint slice", + value: pmetricHistogramDataPointSlice, + expected: 5, + }, + { + name: "pmetric Metric slice", + value: pmetricMetricSlice, + expected: 5, + }, + { + name: "pmetric NumberDataPoint slice", + value: pmetricNumberDataPointSlice, + expected: 5, + }, + { + name: "pmetric Resource slice", + value: pmetricResourceSlice, + expected: 5, + }, + { + name: "pmetric ScopeMetrics slice", + value: pmetricScopeMetricsSlice, + expected: 5, + }, + { + name: "pmetric SummaryDataPoint slice", + value: pmetricSummaryDataPointSlice, + expected: 5, + }, + { + name: "pmetric SummaryDataPointValueAtQuantile slice", + value: pmetricSummaryDataPointValueAtQuantileSlice, + expected: 5, + }, + { + name: "ptrace ResourceSpans slice", + value: ptraceResourceSpansSlice, + expected: 5, + }, + { + name: "ptrace ScopeSpans slice", + value: ptraceScopeSpansSlice, + expected: 5, + }, + { + name: "ptrace SpanEvent slice", + value: ptraceSpanEventSlice, + expected: 5, + }, + + { + name: "ptrace SpanLink slice", + value: ptraceSpanLinkSlice, + expected: 5, + }, + { + name: "ptrace Span slice", + value: ptraceSpanSlice, + expected: 5, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/pkg/ottl/ottlfuncs/func_substring.go b/pkg/ottl/ottlfuncs/func_substring.go index 43eedf9b2048..b1658a8dc608 100644 --- a/pkg/ottl/ottlfuncs/func_substring.go +++ b/pkg/ottl/ottlfuncs/func_substring.go @@ -12,8 +12,8 @@ import ( type SubstringArguments[K any] struct { Target ottl.StringGetter[K] `ottlarg:"0"` - Start int64 `ottlarg:"1"` - Length int64 `ottlarg:"2"` + Start ottl.IntGetter[K] `ottlarg:"1"` + Length ottl.IntGetter[K] `ottlarg:"2"` } func NewSubstringFactory[K any]() ottl.Factory[K] { @@ -27,18 +27,25 @@ func createSubstringFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments return nil, fmt.Errorf("SubstringFactory args must be of type *SubstringArguments[K]") } - return substring(args.Target, args.Start, args.Length) + return substring(args.Target, args.Start, args.Length), nil } -func substring[K any](target ottl.StringGetter[K], start int64, length int64) (ottl.ExprFunc[K], error) { - if start < 0 { - return nil, fmt.Errorf("invalid start for substring function, %d cannot be negative", start) - } - if length <= 0 { - return nil, fmt.Errorf("invalid length for substring function, %d cannot be negative or zero", length) - } - +func substring[K any](target ottl.StringGetter[K], startGetter ottl.IntGetter[K], lengthGetter ottl.IntGetter[K]) ottl.ExprFunc[K] { return func(ctx context.Context, tCtx K) (interface{}, error) { + start, err := startGetter.Get(ctx, tCtx) + if err != nil { + return nil, err + } + if start < 0 { + return nil, fmt.Errorf("invalid start for substring function, %d cannot be negative", start) + } + length, err := lengthGetter.Get(ctx, tCtx) + if err != nil { + return nil, err + } + if length <= 0 { + return nil, fmt.Errorf("invalid length for substring function, %d cannot be negative or zero", length) + } val, err := target.Get(ctx, tCtx) if err != nil { return nil, err @@ -47,5 +54,5 @@ func substring[K any](target ottl.StringGetter[K], start int64, length int64) (o return nil, fmt.Errorf("invalid range for substring function, %d cannot be greater than the length of target string(%d)", start+length, len(val)) } return val[start : start+length], nil - }, nil + } } diff --git a/pkg/ottl/ottlfuncs/func_substring_test.go b/pkg/ottl/ottlfuncs/func_substring_test.go index 9e1580b20e83..1b659e9b6d76 100644 --- a/pkg/ottl/ottlfuncs/func_substring_test.go +++ b/pkg/ottl/ottlfuncs/func_substring_test.go @@ -16,8 +16,8 @@ func Test_substring(t *testing.T) { tests := []struct { name string target ottl.StringGetter[interface{}] - start int64 - length int64 + start ottl.IntGetter[interface{}] + length ottl.IntGetter[interface{}] expected interface{} }{ { @@ -27,8 +27,16 @@ func Test_substring(t *testing.T) { return "123456789", nil }, }, - start: 3, - length: 3, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, expected: "456", }, { @@ -38,15 +46,22 @@ func Test_substring(t *testing.T) { return "123456789", nil }, }, - start: 0, - length: 9, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(0), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(9), nil + }, + }, expected: "123456789", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - exprFunc, err := substring(tt.target, tt.start, tt.length) - assert.NoError(t, err) + exprFunc := substring(tt.target, tt.start, tt.length) result, err := exprFunc(nil, nil) assert.NoError(t, err) assert.Equal(t, tt.expected, result) @@ -58,8 +73,8 @@ func Test_substring_validation(t *testing.T) { tests := []struct { name string target ottl.StringGetter[interface{}] - start int64 - length int64 + start ottl.IntGetter[interface{}] + length ottl.IntGetter[interface{}] }{ { name: "substring with result of empty string", @@ -68,8 +83,16 @@ func Test_substring_validation(t *testing.T) { return "123456789", nil }, }, - start: 0, - length: 0, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(0), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(0), nil + }, + }, }, { name: "substring with invalid start index", @@ -78,14 +101,24 @@ func Test_substring_validation(t *testing.T) { return "123456789", nil }, }, - start: -1, - length: 6, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(-1), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(6), nil + }, + }, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := substring(tt.target, tt.start, tt.length) + exprFunc := substring(tt.target, tt.start, tt.length) + result, err := exprFunc(nil, nil) assert.Error(t, err) + assert.Nil(t, result) }) } } @@ -94,8 +127,8 @@ func Test_substring_error(t *testing.T) { tests := []struct { name string target ottl.StringGetter[interface{}] - start int64 - length int64 + start ottl.IntGetter[interface{}] + length ottl.IntGetter[interface{}] }{ { name: "substring empty string", @@ -104,8 +137,16 @@ func Test_substring_error(t *testing.T) { return "", nil }, }, - start: 3, - length: 6, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(6), nil + }, + }, }, { name: "substring with invalid length index", @@ -114,8 +155,16 @@ func Test_substring_error(t *testing.T) { return "123456789", nil }, }, - start: 3, - length: 20, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(20), nil + }, + }, }, { name: "substring non-string", @@ -124,8 +173,16 @@ func Test_substring_error(t *testing.T) { return 123456789, nil }, }, - start: 3, - length: 6, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(6), nil + }, + }, }, { name: "substring nil string", @@ -134,14 +191,21 @@ func Test_substring_error(t *testing.T) { return nil, nil }, }, - start: 3, - length: 6, + start: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(3), nil + }, + }, + length: &ottl.StandardIntGetter[interface{}]{ + Getter: func(context.Context, interface{}) (interface{}, error) { + return int64(6), nil + }, + }, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - exprFunc, err := substring(tt.target, tt.start, tt.length) - assert.NoError(t, err) + exprFunc := substring(tt.target, tt.start, tt.length) result, err := exprFunc(nil, nil) assert.Error(t, err) assert.Equal(t, nil, result) diff --git a/pkg/ottl/ottlfuncs/functions.go b/pkg/ottl/ottlfuncs/functions.go index e8d0b577e29d..2dab492a0ae5 100644 --- a/pkg/ottl/ottlfuncs/functions.go +++ b/pkg/ottl/ottlfuncs/functions.go @@ -37,14 +37,21 @@ func converters[K any]() []ottl.Factory[K] { NewConcatFactory[K](), NewConvertCaseFactory[K](), NewDurationFactory[K](), + NewExtractPatternsFactory[K](), NewFnvFactory[K](), + NewHoursFactory[K](), NewIntFactory[K](), NewIsMapFactory[K](), NewIsMatchFactory[K](), NewIsStringFactory[K](), NewLenFactory[K](), NewLogFactory[K](), + NewMicrosecondsFactory[K](), + NewMillisecondsFactory[K](), + NewMinutesFactory[K](), + NewNanosecondsFactory[K](), NewParseJSONFactory[K](), + NewSecondsFactory[K](), NewSHA1Factory[K](), NewSHA256Factory[K](), NewSpanIDFactory[K](), diff --git a/pkg/pdatatest/pmetrictest/metrics.go b/pkg/pdatatest/pmetrictest/metrics.go index f795ea004e10..48a3cc971189 100644 --- a/pkg/pdatatest/pmetrictest/metrics.go +++ b/pkg/pdatatest/pmetrictest/metrics.go @@ -240,6 +240,7 @@ func CompareMetric(expected pmetric.Metric, actual pmetric.Metric) error { return errs } + //exhaustive:enforce switch actual.Type() { case pmetric.MetricTypeGauge: errs = multierr.Append(errs, compareNumberDataPointSlices(expected.Gauge().DataPoints(), diff --git a/pkg/pdatatest/pmetrictest/options.go b/pkg/pdatatest/pmetrictest/options.go index cf52d633cd52..3248a82029f9 100644 --- a/pkg/pdatatest/pmetrictest/options.go +++ b/pkg/pdatatest/pmetrictest/options.go @@ -59,6 +59,7 @@ func maskMetricSliceValues(metrics pmetric.MetricSlice, metricNames ...string) { func getDataPointSlice(metric pmetric.Metric) pmetric.NumberDataPointSlice { var dataPointSlice pmetric.NumberDataPointSlice + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: dataPointSlice = metric.Gauge().DataPoints() @@ -96,6 +97,7 @@ func maskTimestamp(metrics pmetric.Metrics, ts pcommon.Timestamp) { for j := 0; j < rms.At(i).ScopeMetrics().Len(); j++ { for k := 0; k < rms.At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { m := rms.At(i).ScopeMetrics().At(j).Metrics().At(k) + //exhaustive:enforce switch m.Type() { case pmetric.MetricTypeGauge: for l := 0; l < m.Gauge().DataPoints().Len(); l++ { @@ -139,6 +141,7 @@ func maskStartTimestamp(metrics pmetric.Metrics, ts pcommon.Timestamp) { for j := 0; j < rms.At(i).ScopeMetrics().Len(); j++ { for k := 0; k < rms.At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { m := rms.At(i).ScopeMetrics().At(j).Metrics().At(k) + //exhaustive:enforce switch m.Type() { case pmetric.MetricTypeGauge: for l := 0; l < m.Gauge().DataPoints().Len(); l++ { @@ -392,6 +395,7 @@ func sortMetricDataPointSlices(ms pmetric.Metrics) { for j := 0; j < ms.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ { for k := 0; k < ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { m := ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k) + //exhaustive:enforce switch m.Type() { case pmetric.MetricTypeGauge: sortNumberDataPointSlice(m.Gauge().DataPoints()) diff --git a/pkg/resourcetotelemetry/resource_to_telemetry.go b/pkg/resourcetotelemetry/resource_to_telemetry.go index de196bc7b3a0..67852f4d1015 100644 --- a/pkg/resourcetotelemetry/resource_to_telemetry.go +++ b/pkg/resourcetotelemetry/resource_to_telemetry.go @@ -67,6 +67,7 @@ func convertToMetricsAttributes(md pmetric.Metrics) pmetric.Metrics { // addAttributesToMetric adds additional labels to the given metric func addAttributesToMetric(metric pmetric.Metric, labelMap pcommon.Map) { + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: addAttributesToNumberDataPoints(metric.Gauge().DataPoints(), labelMap) diff --git a/pkg/stanza/adapter/frompdataconverter.go b/pkg/stanza/adapter/frompdataconverter.go index 4a12c969b9fd..11a18e6d633b 100644 --- a/pkg/stanza/adapter/frompdataconverter.go +++ b/pkg/stanza/adapter/frompdataconverter.go @@ -17,7 +17,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" ) -// FromPdataConverter converts a set of entry.Entry into plog.Logs +// FromPdataConverter converts plog.Logs into a set of entry.Entry // // The diagram below illustrates the internal communication inside the FromPdataConverter: // diff --git a/pkg/stanza/decoder/decoder.go b/pkg/stanza/decoder/decoder.go new file mode 100644 index 000000000000..4b0a1fc5bbe2 --- /dev/null +++ b/pkg/stanza/decoder/decoder.go @@ -0,0 +1,81 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package decoder // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" + +import ( + "errors" + "fmt" + "strings" + + "golang.org/x/text/encoding" + "golang.org/x/text/encoding/ianaindex" + "golang.org/x/text/encoding/unicode" + "golang.org/x/text/transform" +) + +type Decoder struct { + encoding encoding.Encoding + decoder *encoding.Decoder + decodeBuffer []byte +} + +// New wraps a character set encoding and creates a reusable buffer to reduce allocation. +// Decoder is not thread-safe and must not be used in multiple goroutines. +func New(enc encoding.Encoding) *Decoder { + return &Decoder{ + encoding: enc, + decoder: enc.NewDecoder(), + decodeBuffer: make([]byte, 1<<12), + } +} + +// Decode converts the bytes in msgBuf to UTF-8 from the configured encoding. +func (d *Decoder) Decode(msgBuf []byte) ([]byte, error) { + for { + d.decoder.Reset() + nDst, _, err := d.decoder.Transform(d.decodeBuffer, msgBuf, true) + if err == nil { + return d.decodeBuffer[:nDst], nil + } + if errors.Is(err, transform.ErrShortDst) { + d.decodeBuffer = make([]byte, len(d.decodeBuffer)*2) + continue + } + return nil, fmt.Errorf("transform encoding: %w", err) + } +} + +var encodingOverrides = map[string]encoding.Encoding{ + "": unicode.UTF8, + "nop": encoding.Nop, + "ascii": unicode.UTF8, + "us-ascii": unicode.UTF8, + "utf8": unicode.UTF8, + "utf-8": unicode.UTF8, + "utf16": unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), + "utf-16": unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), +} + +// LookupEncoding attempts to match the string name provided with a character set encoding. +func LookupEncoding(enc string) (encoding.Encoding, error) { + if e, ok := encodingOverrides[strings.ToLower(enc)]; ok { + return e, nil + } + e, err := ianaindex.IANA.Encoding(enc) + if err != nil { + return nil, fmt.Errorf("unsupported encoding '%s'", enc) + } + if e == nil { + return nil, fmt.Errorf("no charmap defined for encoding '%s'", enc) + } + return e, nil +} + +func IsNop(enc string) bool { + e, err := LookupEncoding(enc) + if err != nil { + return false + } + return e == encoding.Nop +} diff --git a/pkg/stanza/docs/operators/README.md b/pkg/stanza/docs/operators/README.md index 30c5b54ec3b7..ea253af42f2b 100644 --- a/pkg/stanza/docs/operators/README.md +++ b/pkg/stanza/docs/operators/README.md @@ -1,7 +1,7 @@ ## What is an operator? An operator is the most basic unit of log processing. Each operator fulfills a single responsibility, such as reading lines from a file, or parsing JSON from a field. Operators are then chained together in a pipeline to achieve a desired result. -For instance, a user may read lines from a file using the `file_input` operator. From there, the results of this operation may be sent to a `regex_parser` operator that creates fields based on a regex pattern. And then finally, these results may be sent to a `elastic_output` operator that writes each line to Elasticsearch. +For instance, a user may read lines from a file using the `file_input` operator. From there, the results of this operation may be sent to a `regex_parser` operator that creates fields based on a regex pattern. And then finally, these results may be sent to a `file_output` operator that writes each line to a file on disk. ## What operators are available? diff --git a/pkg/stanza/fileconsumer/config.go b/pkg/stanza/fileconsumer/config.go index 0eb9d02203de..2b29d9ddbe74 100644 --- a/pkg/stanza/fileconsumer/config.go +++ b/pkg/stanza/fileconsumer/config.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header" @@ -19,6 +20,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) const ( @@ -48,7 +50,7 @@ func NewConfig() *Config { IncludeFileNameResolved: false, IncludeFilePathResolved: false, PollInterval: 200 * time.Millisecond, - Splitter: helper.NewSplitterConfig(), + Splitter: tokenize.NewSplitterConfig(), StartAt: "end", FingerprintSize: fingerprint.DefaultSize, MaxLogSize: defaultMaxLogSize, @@ -60,19 +62,19 @@ func NewConfig() *Config { // Config is the configuration of a file input operator type Config struct { matcher.Criteria `mapstructure:",squash"` - IncludeFileName bool `mapstructure:"include_file_name,omitempty"` - IncludeFilePath bool `mapstructure:"include_file_path,omitempty"` - IncludeFileNameResolved bool `mapstructure:"include_file_name_resolved,omitempty"` - IncludeFilePathResolved bool `mapstructure:"include_file_path_resolved,omitempty"` - PollInterval time.Duration `mapstructure:"poll_interval,omitempty"` - StartAt string `mapstructure:"start_at,omitempty"` - FingerprintSize helper.ByteSize `mapstructure:"fingerprint_size,omitempty"` - MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` - MaxConcurrentFiles int `mapstructure:"max_concurrent_files,omitempty"` - MaxBatches int `mapstructure:"max_batches,omitempty"` - DeleteAfterRead bool `mapstructure:"delete_after_read,omitempty"` - Splitter helper.SplitterConfig `mapstructure:",squash,omitempty"` - Header *HeaderConfig `mapstructure:"header,omitempty"` + IncludeFileName bool `mapstructure:"include_file_name,omitempty"` + IncludeFilePath bool `mapstructure:"include_file_path,omitempty"` + IncludeFileNameResolved bool `mapstructure:"include_file_name_resolved,omitempty"` + IncludeFilePathResolved bool `mapstructure:"include_file_path_resolved,omitempty"` + PollInterval time.Duration `mapstructure:"poll_interval,omitempty"` + StartAt string `mapstructure:"start_at,omitempty"` + FingerprintSize helper.ByteSize `mapstructure:"fingerprint_size,omitempty"` + MaxLogSize helper.ByteSize `mapstructure:"max_log_size,omitempty"` + MaxConcurrentFiles int `mapstructure:"max_concurrent_files,omitempty"` + MaxBatches int `mapstructure:"max_batches,omitempty"` + DeleteAfterRead bool `mapstructure:"delete_after_read,omitempty"` + Splitter tokenize.SplitterConfig `mapstructure:",squash,omitempty"` + Header *HeaderConfig `mapstructure:"header,omitempty"` } type HeaderConfig struct { @@ -130,7 +132,7 @@ func (c Config) buildManager(logger *zap.SugaredLogger, emit emit.Callback, fact var hCfg *header.Config if c.Header != nil { - enc, err := helper.LookupEncoding(c.Splitter.EncodingConfig.Encoding) + enc, err := decoder.LookupEncoding(c.Splitter.Encoding) if err != nil { return nil, fmt.Errorf("failed to create encoding: %w", err) } @@ -146,6 +148,11 @@ func (c Config) buildManager(logger *zap.SugaredLogger, emit emit.Callback, fact return nil, err } + enc, err := decoder.LookupEncoding(c.Splitter.Encoding) + if err != nil { + return nil, err + } + return &Manager{ SugaredLogger: logger.With("component", "fileconsumer"), cancel: func() {}, @@ -162,7 +169,7 @@ func (c Config) buildManager(logger *zap.SugaredLogger, emit emit.Callback, fact }, fromBeginning: startAtBeginning, splitterFactory: factory, - encodingConfig: c.Splitter.EncodingConfig, + encoding: enc, headerConfig: hCfg, }, fileMatcher: fileMatcher, @@ -213,7 +220,7 @@ func (c Config) validate() error { return errors.New("`max_batches` must not be negative") } - enc, err := helper.LookupEncoding(c.Splitter.EncodingConfig.Encoding) + enc, err := decoder.LookupEncoding(c.Splitter.Encoding) if err != nil { return err } diff --git a/pkg/stanza/fileconsumer/config_test.go b/pkg/stanza/fileconsumer/config_test.go index 2c54ba1ad0c1..bcfb9ea91b90 100644 --- a/pkg/stanza/fileconsumer/config_test.go +++ b/pkg/stanza/fileconsumer/config_test.go @@ -17,6 +17,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/operatortest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/regex" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestUnmarshal(t *testing.T) { @@ -279,7 +280,7 @@ func TestUnmarshal(t *testing.T) { Name: "multiline_line_start_string", Expect: func() *mockOperatorConfig { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineStartPattern = "Start" cfg.Splitter = newSplit return newMockOperatorConfig(cfg) @@ -289,7 +290,7 @@ func TestUnmarshal(t *testing.T) { Name: "multiline_line_start_special", Expect: func() *mockOperatorConfig { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineStartPattern = "%" cfg.Splitter = newSplit return newMockOperatorConfig(cfg) @@ -299,7 +300,7 @@ func TestUnmarshal(t *testing.T) { Name: "multiline_line_end_string", Expect: func() *mockOperatorConfig { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineEndPattern = "Start" cfg.Splitter = newSplit return newMockOperatorConfig(cfg) @@ -309,7 +310,7 @@ func TestUnmarshal(t *testing.T) { Name: "multiline_line_end_special", Expect: func() *mockOperatorConfig { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineEndPattern = "%" cfg.Splitter = newSplit return newMockOperatorConfig(cfg) @@ -367,7 +368,7 @@ func TestUnmarshal(t *testing.T) { Name: "encoding_lower", Expect: func() *mockOperatorConfig { cfg := NewConfig() - cfg.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "utf-16le"} + cfg.Splitter.Encoding = "utf-16le" return newMockOperatorConfig(cfg) }(), }, @@ -375,7 +376,7 @@ func TestUnmarshal(t *testing.T) { Name: "encoding_upper", Expect: func() *mockOperatorConfig { cfg := NewConfig() - cfg.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "UTF-16lE"} + cfg.Splitter.Encoding = "UTF-16lE" return newMockOperatorConfig(cfg) }(), }, @@ -451,8 +452,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredStartAndEndPatterns", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "Exists", LineStartPattern: "Exists", } @@ -463,8 +464,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredStartPattern", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: "START.*", } }, @@ -474,8 +475,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredEndPattern", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "END.*", } }, @@ -485,7 +486,7 @@ func TestBuild(t *testing.T) { { "InvalidEncoding", func(f *Config) { - f.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "UTF-3233"} + f.Splitter.Encoding = "UTF-3233" }, require.Error, nil, @@ -493,8 +494,8 @@ func TestBuild(t *testing.T) { { "LineStartAndEnd", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: ".*", LineEndPattern: ".*", } @@ -505,8 +506,8 @@ func TestBuild(t *testing.T) { { "NoLineStartOrEnd", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{} + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{} }, require.NoError, func(t *testing.T, f *Manager) {}, @@ -514,8 +515,8 @@ func TestBuild(t *testing.T) { { "InvalidLineStartRegex", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: "(", } }, @@ -525,8 +526,8 @@ func TestBuild(t *testing.T) { { "InvalidLineEndRegex", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "(", } }, @@ -680,7 +681,7 @@ func TestBuildWithSplitFunc(t *testing.T) { { "InvalidEncoding", func(f *Config) { - f.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "UTF-3233"} + f.Splitter.Encoding = "UTF-3233" }, require.Error, nil, diff --git a/pkg/stanza/fileconsumer/file.go b/pkg/stanza/fileconsumer/file.go index 135b25831af4..15c345377b2a 100644 --- a/pkg/stanza/fileconsumer/file.go +++ b/pkg/stanza/fileconsumer/file.go @@ -379,12 +379,9 @@ func (m *Manager) loadLastPollFiles(ctx context.Context) error { m.Errorw("migrate header attributes: unexpected format") } } - r, err := m.readerFactory.newFromMetadata(rmd) - if err != nil { - m.Errorw("load reader", err) - } else { - m.knownFiles = append(m.knownFiles, r) - } + + // This reader won't be used for anything other than metadata reference, so just wrap the metadata + m.knownFiles = append(m.knownFiles, &reader{readerMetadata: rmd}) } return nil diff --git a/pkg/stanza/fileconsumer/file_test.go b/pkg/stanza/fileconsumer/file_test.go index d04d4e64b413..7361c5eeccf8 100644 --- a/pkg/stanza/fileconsumer/file_test.go +++ b/pkg/stanza/fileconsumer/file_test.go @@ -24,6 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestCleanStop(t *testing.T) { @@ -335,7 +336,7 @@ func TestReadUsingNopEncoding(t *testing.T) { cfg := NewConfig().includeDir(tempDir) cfg.StartAt = "beginning" cfg.MaxLogSize = 8 - cfg.Splitter.EncodingConfig.Encoding = "nop" + cfg.Splitter.Encoding = "nop" operator, emitCalls := buildTestManager(t, cfg) // Create a file, then start @@ -419,7 +420,7 @@ func TestNopEncodingDifferentLogSizes(t *testing.T) { cfg := NewConfig().includeDir(tempDir) cfg.StartAt = "beginning" cfg.MaxLogSize = tc.maxLogSize - cfg.Splitter.EncodingConfig.Encoding = "nop" + cfg.Splitter.Encoding = "nop" operator, emitCalls := buildTestManager(t, cfg) // Create a file, then start @@ -545,7 +546,7 @@ func TestNoNewline(t *testing.T) { tempDir := t.TempDir() cfg := NewConfig().includeDir(tempDir) cfg.StartAt = "beginning" - cfg.Splitter = helper.NewSplitterConfig() + cfg.Splitter = tokenize.NewSplitterConfig() cfg.Splitter.Flusher.Period = time.Nanosecond operator, emitCalls := buildTestManager(t, cfg) @@ -1287,7 +1288,7 @@ func TestEncodings(t *testing.T) { tempDir := t.TempDir() cfg := NewConfig().includeDir(tempDir) cfg.StartAt = "beginning" - cfg.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: tc.encoding} + cfg.Splitter.Encoding = tc.encoding operator, emitCalls := buildTestManager(t, cfg) // Populate the file diff --git a/pkg/stanza/fileconsumer/finder.go b/pkg/stanza/fileconsumer/finder.go deleted file mode 100644 index d04942a22b91..000000000000 --- a/pkg/stanza/fileconsumer/finder.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package fileconsumer // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" - -import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" - -// Deprecated: [v0.83.0] Use matcher.Criteria instead. -type MatchingCriteria = matcher.Criteria - -// Deprecated: [v0.83.0] Use matcher.OrderingCriteria instead. -type OrderingCriteria = matcher.OrderingCriteria - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type NumericSortRule = matcher.Sort - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type AlphabeticalSortRule = matcher.Sort - -// Deprecated: [v0.83.0] Use matcher.Sort instead. -type TimestampSortRule = matcher.Sort diff --git a/pkg/stanza/fileconsumer/internal/header/config.go b/pkg/stanza/fileconsumer/internal/header/config.go index 9bd329a95ec8..5645607640bd 100644 --- a/pkg/stanza/fileconsumer/internal/header/config.go +++ b/pkg/stanza/fileconsumer/internal/header/config.go @@ -14,8 +14,8 @@ import ( "golang.org/x/text/encoding" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/pipeline" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) type Config struct { @@ -69,7 +69,7 @@ func NewConfig(matchRegex string, metadataOperators []operator.Config, enc encod return nil, fmt.Errorf("failed to compile `pattern`: %w", err) } - splitFunc, err := helper.NewNewlineSplitFunc(enc, false, func(b []byte) []byte { + splitFunc, err := tokenize.NewNewlineSplitFunc(enc, false, func(b []byte) []byte { return bytes.Trim(b, "\r\n") }) if err != nil { diff --git a/pkg/stanza/fileconsumer/internal/splitter/custom.go b/pkg/stanza/fileconsumer/internal/splitter/custom.go index 930dedf23e05..d4059962bd19 100644 --- a/pkg/stanza/fileconsumer/internal/splitter/custom.go +++ b/pkg/stanza/fileconsumer/internal/splitter/custom.go @@ -6,18 +6,18 @@ package splitter // import "github.com/open-telemetry/opentelemetry-collector-co import ( "bufio" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) type customFactory struct { - Flusher helper.FlusherConfig + Flusher tokenize.FlusherConfig Splitter bufio.SplitFunc } var _ Factory = (*customFactory)(nil) func NewCustomFactory( - flusher helper.FlusherConfig, + flusher tokenize.FlusherConfig, splitter bufio.SplitFunc) Factory { return &customFactory{ Flusher: flusher, diff --git a/pkg/stanza/fileconsumer/internal/splitter/custom_test.go b/pkg/stanza/fileconsumer/internal/splitter/custom_test.go index 867e5ad5e109..2d40533f1b50 100644 --- a/pkg/stanza/fileconsumer/internal/splitter/custom_test.go +++ b/pkg/stanza/fileconsumer/internal/splitter/custom_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestCustomFactory(t *testing.T) { type fields struct { - Flusher helper.FlusherConfig + Flusher tokenize.FlusherConfig Splitter bufio.SplitFunc } type args struct { @@ -29,7 +29,7 @@ func TestCustomFactory(t *testing.T) { { name: "default configuration", fields: fields{ - Flusher: helper.NewFlusherConfig(), + Flusher: tokenize.NewFlusherConfig(), Splitter: func(data []byte, atEOF bool) (advance int, token []byte, err error) { return len(data), data, nil }, diff --git a/pkg/stanza/fileconsumer/internal/splitter/multiline.go b/pkg/stanza/fileconsumer/internal/splitter/multiline.go index cde725d8eeeb..66b1d2c8a5aa 100644 --- a/pkg/stanza/fileconsumer/internal/splitter/multiline.go +++ b/pkg/stanza/fileconsumer/internal/splitter/multiline.go @@ -6,16 +6,17 @@ package splitter // import "github.com/open-telemetry/opentelemetry-collector-co import ( "bufio" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) type multilineFactory struct { - helper.SplitterConfig + tokenize.SplitterConfig } var _ Factory = (*multilineFactory)(nil) -func NewMultilineFactory(splitter helper.SplitterConfig) Factory { +func NewMultilineFactory(splitter tokenize.SplitterConfig) Factory { return &multilineFactory{ SplitterConfig: splitter, } @@ -23,7 +24,7 @@ func NewMultilineFactory(splitter helper.SplitterConfig) Factory { // Build builds Multiline Splitter struct func (factory *multilineFactory) Build(maxLogSize int) (bufio.SplitFunc, error) { - enc, err := helper.LookupEncoding(factory.EncodingConfig.Encoding) + enc, err := decoder.LookupEncoding(factory.Encoding) if err != nil { return nil, err } diff --git a/pkg/stanza/fileconsumer/internal/splitter/multiline_test.go b/pkg/stanza/fileconsumer/internal/splitter/multiline_test.go index ec8442e6a99d..99a8b8a2a44c 100644 --- a/pkg/stanza/fileconsumer/internal/splitter/multiline_test.go +++ b/pkg/stanza/fileconsumer/internal/splitter/multiline_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestMultilineBuild(t *testing.T) { @@ -17,13 +17,13 @@ func TestMultilineBuild(t *testing.T) { } tests := []struct { name string - splitterConfig helper.SplitterConfig + splitterConfig tokenize.SplitterConfig args args wantErr bool }{ { name: "default configuration", - splitterConfig: helper.NewSplitterConfig(), + splitterConfig: tokenize.NewSplitterConfig(), args: args{ maxLogSize: 1024, }, @@ -31,12 +31,10 @@ func TestMultilineBuild(t *testing.T) { }, { name: "eoncoding error", - splitterConfig: helper.SplitterConfig{ - EncodingConfig: helper.EncodingConfig{ - Encoding: "error", - }, - Flusher: helper.NewFlusherConfig(), - Multiline: helper.NewMultilineConfig(), + splitterConfig: tokenize.SplitterConfig{ + Encoding: "error", + Flusher: tokenize.NewFlusherConfig(), + Multiline: tokenize.NewMultilineConfig(), }, args: args{ maxLogSize: 1024, @@ -45,10 +43,10 @@ func TestMultilineBuild(t *testing.T) { }, { name: "Multiline error", - splitterConfig: helper.SplitterConfig{ - EncodingConfig: helper.NewEncodingConfig(), - Flusher: helper.NewFlusherConfig(), - Multiline: helper.MultilineConfig{ + splitterConfig: tokenize.SplitterConfig{ + Encoding: "utf-8", + Flusher: tokenize.NewFlusherConfig(), + Multiline: tokenize.MultilineConfig{ LineStartPattern: "START", LineEndPattern: "END", }, diff --git a/pkg/stanza/fileconsumer/reader.go b/pkg/stanza/fileconsumer/reader.go index dafc64d7ab15..94754fde49f9 100644 --- a/pkg/stanza/fileconsumer/reader.go +++ b/pkg/stanza/fileconsumer/reader.go @@ -12,11 +12,11 @@ import ( "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/scanner" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" ) type readerConfig struct { @@ -44,7 +44,7 @@ type reader struct { file *os.File lineSplitFunc bufio.SplitFunc splitFunc bufio.SplitFunc - decoder *helper.Decoder + decoder *decoder.Decoder headerReader *header.Reader processFunc emit.Callback generation int diff --git a/pkg/stanza/fileconsumer/reader_factory.go b/pkg/stanza/fileconsumer/reader_factory.go index 2be144cf09a4..8e51a5694270 100644 --- a/pkg/stanza/fileconsumer/reader_factory.go +++ b/pkg/stanza/fileconsumer/reader_factory.go @@ -10,12 +10,13 @@ import ( "runtime" "go.uber.org/zap" + "golang.org/x/text/encoding" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/splitter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/util" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" ) type readerFactory struct { @@ -23,136 +24,107 @@ type readerFactory struct { readerConfig *readerConfig fromBeginning bool splitterFactory splitter.Factory - encodingConfig helper.EncodingConfig + encoding encoding.Encoding headerConfig *header.Config } func (f *readerFactory) newReader(file *os.File, fp *fingerprint.Fingerprint) (*reader, error) { - return readerBuilder{ - readerFactory: f, - file: file, - readerMetadata: &readerMetadata{ - Fingerprint: fp, - FileAttributes: map[string]any{}, - }, - }.build() -} - -func (f *readerFactory) newFromMetadata(m *readerMetadata) (*reader, error) { - return readerBuilder{ - readerFactory: f, - readerMetadata: m, - }.build() + lineSplitFunc, err := f.splitterFactory.Build(f.readerConfig.maxLogSize) + if err != nil { + return nil, err + } + return f.build(file, &readerMetadata{ + Fingerprint: fp, + FileAttributes: map[string]any{}, + }, lineSplitFunc) } // copy creates a deep copy of a reader func (f *readerFactory) copy(old *reader, newFile *os.File) (*reader, error) { - return readerBuilder{ - readerFactory: f, - file: newFile, - splitFunc: old.lineSplitFunc, - readerMetadata: &readerMetadata{ - Fingerprint: old.Fingerprint.Copy(), - Offset: old.Offset, - FileAttributes: util.MapCopy(old.FileAttributes), - HeaderFinalized: old.HeaderFinalized, - }, - }.build() + var err error + lineSplitFunc := old.lineSplitFunc + if lineSplitFunc == nil { + lineSplitFunc, err = f.splitterFactory.Build(f.readerConfig.maxLogSize) + if err != nil { + return nil, err + } + } + return f.build(newFile, &readerMetadata{ + Fingerprint: old.Fingerprint.Copy(), + Offset: old.Offset, + FileAttributes: util.MapCopy(old.FileAttributes), + HeaderFinalized: old.HeaderFinalized, + }, lineSplitFunc) } func (f *readerFactory) newFingerprint(file *os.File) (*fingerprint.Fingerprint, error) { return fingerprint.New(file, f.readerConfig.fingerprintSize) } -type readerBuilder struct { - *readerFactory - file *os.File - readerMetadata *readerMetadata - splitFunc bufio.SplitFunc -} - -func (b readerBuilder) build() (r *reader, err error) { +func (f *readerFactory) build(file *os.File, m *readerMetadata, lineSplitFunc bufio.SplitFunc) (r *reader, err error) { r = &reader{ - readerConfig: b.readerConfig, - readerMetadata: b.readerMetadata, + readerConfig: f.readerConfig, + readerMetadata: m, + file: file, + SugaredLogger: f.SugaredLogger.With("path", file.Name()), + decoder: decoder.New(f.encoding), + lineSplitFunc: lineSplitFunc, } - if b.splitFunc != nil { - r.lineSplitFunc = b.splitFunc - } else { - r.lineSplitFunc, err = b.splitterFactory.Build(b.readerConfig.maxLogSize) - if err != nil { + if !f.fromBeginning { + if err = r.offsetToEnd(); err != nil { return nil, err } } - encoding, err := helper.LookupEncoding(b.encodingConfig.Encoding) - if err != nil { - return nil, err - } - r.decoder = helper.NewDecoder(encoding) - - if b.headerConfig == nil || b.readerMetadata.HeaderFinalized { + if f.headerConfig == nil || m.HeaderFinalized { r.splitFunc = r.lineSplitFunc - r.processFunc = b.readerConfig.emit + r.processFunc = f.readerConfig.emit } else { - r.splitFunc = b.headerConfig.SplitFunc - r.headerReader, err = header.NewReader(b.SugaredLogger, *b.headerConfig) + r.splitFunc = f.headerConfig.SplitFunc + r.headerReader, err = header.NewReader(f.SugaredLogger, *f.headerConfig) if err != nil { return nil, err } r.processFunc = r.headerReader.Process } - if b.file == nil { - return r, nil - } - - r.file = b.file - r.SugaredLogger = b.SugaredLogger.With("path", b.file.Name()) - // Resolve file name and path attributes - resolved := b.file.Name() + resolved := file.Name() // Dirty solution, waiting for this permanent fix https://github.com/golang/go/issues/39786 // EvalSymlinks on windows is partially working depending on the way you use Symlinks and Junctions if runtime.GOOS != "windows" { - resolved, err = filepath.EvalSymlinks(b.file.Name()) + resolved, err = filepath.EvalSymlinks(file.Name()) if err != nil { - b.Errorf("resolve symlinks: %w", err) + f.Errorf("resolve symlinks: %w", err) } } abs, err := filepath.Abs(resolved) if err != nil { - b.Errorf("resolve abs: %w", err) + f.Errorf("resolve abs: %w", err) } - if b.readerConfig.includeFileName { - r.FileAttributes[logFileName] = filepath.Base(b.file.Name()) + if f.readerConfig.includeFileName { + r.FileAttributes[logFileName] = filepath.Base(file.Name()) } else if r.FileAttributes[logFileName] != nil { delete(r.FileAttributes, logFileName) } - if b.readerConfig.includeFilePath { - r.FileAttributes[logFilePath] = b.file.Name() + if f.readerConfig.includeFilePath { + r.FileAttributes[logFilePath] = file.Name() } else if r.FileAttributes[logFilePath] != nil { delete(r.FileAttributes, logFilePath) } - if b.readerConfig.includeFileNameResolved { + if f.readerConfig.includeFileNameResolved { r.FileAttributes[logFileNameResolved] = filepath.Base(abs) } else if r.FileAttributes[logFileNameResolved] != nil { delete(r.FileAttributes, logFileNameResolved) } - if b.readerConfig.includeFilePathResolved { + if f.readerConfig.includeFilePathResolved { r.FileAttributes[logFilePathResolved] = abs } else if r.FileAttributes[logFilePathResolved] != nil { delete(r.FileAttributes, logFilePathResolved) } - if !b.fromBeginning { - if err = r.offsetToEnd(); err != nil { - return nil, err - } - } - return r, nil } diff --git a/pkg/stanza/fileconsumer/reader_test.go b/pkg/stanza/fileconsumer/reader_test.go index 178ba1da63bd..4f2d3be9da94 100644 --- a/pkg/stanza/fileconsumer/reader_test.go +++ b/pkg/stanza/fileconsumer/reader_test.go @@ -8,17 +8,54 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/splitter" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/regex" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) +func TestPersistFlusher(t *testing.T) { + flushPeriod := 100 * time.Millisecond + sCfg := tokenize.NewSplitterConfig() + sCfg.Flusher.Period = flushPeriod + f, emitChan := testReaderFactoryWithSplitter(t, sCfg) + + temp := openTemp(t, t.TempDir()) + fp, err := f.newFingerprint(temp) + require.NoError(t, err) + + r, err := f.newReader(temp, fp) + require.NoError(t, err) + + _, err = temp.WriteString("log with newline\nlog without newline") + require.NoError(t, err) + + // ReadToEnd will return when we hit eof, but we shouldn't emit the unfinished log yet + r.ReadToEnd(context.Background()) + waitForToken(t, emitChan, []byte("log with newline")) + + // Even trying again shouldn't produce the log yet because the flush period still hasn't expired. + r.ReadToEnd(context.Background()) + expectNoTokensUntil(t, emitChan, 2*flushPeriod) + + // A copy of the reader should remember that we last emitted about 200ms ago. + copyReader, err := f.copy(r, temp) + assert.NoError(t, err) + + // This time, the flusher will kick in and we should emit the unfinished log. + // If the copy did not remember when we last emitted a log, then the flushPeriod + // will not be expired at this point so we won't see the unfinished log. + copyReader.ReadToEnd(context.Background()) + waitForToken(t, emitChan, []byte("log without newline")) +} + func TestTokenization(t *testing.T) { testCases := []struct { testName string @@ -137,12 +174,12 @@ func TestTokenizationTooLongWithLineStartPattern(t *testing.T) { f, emitChan := testReaderFactory(t) - mlc := helper.NewMultilineConfig() + mlc := tokenize.NewMultilineConfig() mlc.LineStartPattern = `\d+-\d+-\d+` - f.splitterFactory = splitter.NewMultilineFactory(helper.SplitterConfig{ - EncodingConfig: helper.NewEncodingConfig(), - Flusher: helper.NewFlusherConfig(), - Multiline: mlc, + f.splitterFactory = splitter.NewMultilineFactory(tokenize.SplitterConfig{ + Encoding: "utf-8", + Flusher: tokenize.NewFlusherConfig(), + Multiline: mlc, }) f.readerConfig.maxLogSize = 15 @@ -173,10 +210,7 @@ func TestHeaderFingerprintIncluded(t *testing.T) { regexConf := regex.NewConfig() regexConf.Regex = "^#(?P
.*)" - encodingConf := helper.EncodingConfig{ - Encoding: "utf-8", - } - enc, err := helper.LookupEncoding(encodingConf.Encoding) + enc, err := decoder.LookupEncoding("utf-8") require.NoError(t, err) h, err := header.NewConfig("^#", []operator.Config{{Builder: regexConf}}, enc) @@ -200,8 +234,13 @@ func TestHeaderFingerprintIncluded(t *testing.T) { } func testReaderFactory(t *testing.T) (*readerFactory, chan *emitParams) { + return testReaderFactoryWithSplitter(t, tokenize.NewSplitterConfig()) +} + +func testReaderFactoryWithSplitter(t *testing.T, splitterConfig tokenize.SplitterConfig) (*readerFactory, chan *emitParams) { emitChan := make(chan *emitParams, 100) - splitterConfig := helper.NewSplitterConfig() + enc, err := decoder.LookupEncoding(splitterConfig.Encoding) + require.NoError(t, err) return &readerFactory{ SugaredLogger: testutil.Logger(t), readerConfig: &readerConfig{ @@ -211,7 +250,7 @@ func testReaderFactory(t *testing.T) (*readerFactory, chan *emitParams) { }, fromBeginning: true, splitterFactory: splitter.NewMultilineFactory(splitterConfig), - encodingConfig: splitterConfig.EncodingConfig, + encoding: enc, }, emitChan } diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 8fc43edb037b..dee6e62441eb 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -26,7 +26,7 @@ require ( go.uber.org/zap v1.25.0 golang.org/x/sys v0.11.0 golang.org/x/text v0.12.0 - gonum.org/v1/gonum v0.13.0 + gonum.org/v1/gonum v0.14.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index edd352a4a714..1a1d8a65544d 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -435,8 +435,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/pkg/stanza/operator/helper/encoding.go b/pkg/stanza/operator/helper/encoding.go index 607a9c1c629e..9a625fd623f2 100644 --- a/pkg/stanza/operator/helper/encoding.go +++ b/pkg/stanza/operator/helper/encoding.go @@ -3,112 +3,28 @@ package helper // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" -import ( - "errors" - "fmt" - "strings" +import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/ianaindex" - "golang.org/x/text/encoding/unicode" - "golang.org/x/text/transform" -) - -// NewEncodingConfig creates a new Encoding config +// Deprecated: [v0.84.0] func NewEncodingConfig() EncodingConfig { return EncodingConfig{ Encoding: "utf-8", } } -// EncodingConfig is the configuration of an Encoding helper +// Deprecated: [v0.84.0] type EncodingConfig struct { Encoding string `mapstructure:"encoding,omitempty"` } -// Deprecated: [v0.83.0] Use NewDecoder instead. -func (c EncodingConfig) Build() (Encoding, error) { - enc, err := LookupEncoding(c.Encoding) - if err != nil { - return Encoding{}, err - } - - return Encoding{ - Encoding: enc, - decodeBuffer: make([]byte, 1<<12), - decoder: enc.NewDecoder(), - }, nil -} +// Deprecated: [v0.84.0] Use decoder.Decoder instead +type Decoder = decoder.Decoder -// Deprecated: [v0.83.0] Use Decoder instead. -type Encoding struct { - Encoding encoding.Encoding - decoder *encoding.Decoder - decodeBuffer []byte -} +// Deprecated: [v0.84.0] Use decoder.New instead +var NewDecoder = decoder.New -type Decoder struct { - encoding encoding.Encoding - decoder *encoding.Decoder - decodeBuffer []byte -} +// Deprecated: [v0.84.0] Use decoder.LookupEncoding instead +var LookupEncoding = decoder.LookupEncoding -// NewDecoder wraps a character set encoding and creates a reusable buffer to reduce allocation. -// Decoder is not thread-safe and must not be used in multiple goroutines. -func NewDecoder(enc encoding.Encoding) *Decoder { - return &Decoder{ - encoding: enc, - decoder: enc.NewDecoder(), - decodeBuffer: make([]byte, 1<<12), - } -} - -// Decode converts the bytes in msgBuf to UTF-8 from the configured encoding. -func (d *Decoder) Decode(msgBuf []byte) ([]byte, error) { - for { - d.decoder.Reset() - nDst, _, err := d.decoder.Transform(d.decodeBuffer, msgBuf, true) - if err == nil { - return d.decodeBuffer[:nDst], nil - } - if errors.Is(err, transform.ErrShortDst) { - d.decodeBuffer = make([]byte, len(d.decodeBuffer)*2) - continue - } - return nil, fmt.Errorf("transform encoding: %w", err) - } -} - -var encodingOverrides = map[string]encoding.Encoding{ - "utf-16": unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), - "utf16": unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), - "utf-8": unicode.UTF8, - "utf8": unicode.UTF8, - "ascii": unicode.UTF8, - "us-ascii": unicode.UTF8, - "nop": encoding.Nop, - "": unicode.UTF8, -} - -// LookupEncoding attempts to match the string name provided with a character set encoding. -func LookupEncoding(enc string) (encoding.Encoding, error) { - if e, ok := encodingOverrides[strings.ToLower(enc)]; ok { - return e, nil - } - e, err := ianaindex.IANA.Encoding(enc) - if err != nil { - return nil, fmt.Errorf("unsupported encoding '%s'", enc) - } - if e == nil { - return nil, fmt.Errorf("no charmap defined for encoding '%s'", enc) - } - return e, nil -} - -func IsNop(enc string) bool { - e, err := LookupEncoding(enc) - if err != nil { - return false - } - return e == encoding.Nop -} +// Deprecated: [v0.84.0] Use decoder.IsNop instead +var IsNop = decoder.IsNop diff --git a/pkg/stanza/operator/helper/flusher.go b/pkg/stanza/operator/helper/flusher.go index 60efd4868f11..166ae0485c79 100644 --- a/pkg/stanza/operator/helper/flusher.go +++ b/pkg/stanza/operator/helper/flusher.go @@ -3,98 +3,13 @@ package helper // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" -import ( - "bufio" - "time" -) +import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" -// FlusherConfig is a configuration of Flusher helper -type FlusherConfig struct { - Period time.Duration `mapstructure:"force_flush_period"` -} +// Deprecated: [v0.84.0] Use tokenize.FlusherConfig instead +type FlusherConfig = tokenize.FlusherConfig -// NewFlusherConfig creates a default Flusher config -func NewFlusherConfig() FlusherConfig { - return FlusherConfig{ - // Empty or `0s` means that we will never force flush - Period: time.Millisecond * 500, - } -} +// Deprecated: [v0.84.0] Use tokenize.NewFlusherConfig instead +var NewFlusherConfig = tokenize.NewFlusherConfig -// Build creates Flusher from configuration -func (c *FlusherConfig) Build() *Flusher { - return &Flusher{ - lastDataChange: time.Now(), - forcePeriod: c.Period, - previousDataLength: 0, - } -} - -// Flusher keeps information about flush state -type Flusher struct { - // forcePeriod defines time from last flush which should pass before setting force to true. - // Never forces if forcePeriod is set to 0 - forcePeriod time.Duration - - // lastDataChange tracks date of last data change (including new data and flushes) - lastDataChange time.Time - - // previousDataLength: - // if previousDataLength = 0 - no new data have been received after flush - // if previousDataLength > 0 - there is data which has not been flushed yet and it doesn't changed since lastDataChange - previousDataLength int -} - -func (f *Flusher) UpdateDataChangeTime(length int) { - // Skip if length is greater than 0 and didn't changed - if length > 0 && length == f.previousDataLength { - return - } - - // update internal properties with new values if data length changed - // because it means that data is flowing and being processed - f.previousDataLength = length - f.lastDataChange = time.Now() -} - -// Flushed reset data length -func (f *Flusher) Flushed() { - f.UpdateDataChangeTime(0) -} - -// ShouldFlush returns true if data should be forcefully flushed -func (f *Flusher) ShouldFlush() bool { - // Returns true if there is f.forcePeriod after f.lastDataChange and data length is greater than 0 - return f.forcePeriod > 0 && time.Since(f.lastDataChange) > f.forcePeriod && f.previousDataLength > 0 -} - -func (f *Flusher) SplitFunc(splitFunc bufio.SplitFunc) bufio.SplitFunc { - return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - advance, token, err = splitFunc(data, atEOF) - - // Return as it is in case of error - if err != nil { - return - } - - // Return token - if token != nil { - // Inform flusher that we just flushed - f.Flushed() - return - } - - // If there is no token, force flush eventually - if f.ShouldFlush() { - // Inform flusher that we just flushed - f.Flushed() - token = trimWhitespacesFunc(data) - advance = len(data) - return - } - - // Inform flusher that we didn't flushed - f.UpdateDataChangeTime(len(data)) - return - } -} +// Deprecated: [v0.84.0] Use tokenize.Flusher instead +type Flusher = tokenize.Flusher diff --git a/pkg/stanza/operator/helper/multiline.go b/pkg/stanza/operator/helper/multiline.go index 53fadde0149b..7a237bae9f89 100644 --- a/pkg/stanza/operator/helper/multiline.go +++ b/pkg/stanza/operator/helper/multiline.go @@ -3,254 +3,22 @@ package helper // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" -import ( - "bufio" - "bytes" - "fmt" - "regexp" +import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" - "golang.org/x/text/encoding" -) +// Deprecated: [v0.84.0] Use tokenize.Multiline instead +type Multiline = tokenize.Multiline -// Multiline consists of splitFunc and variables needed to perform force flush -type Multiline struct { - SplitFunc bufio.SplitFunc - Force *Flusher -} +// Deprecated: [v0.84.0] Use tokenize.NewMultiline instead +var NewMultilineConfig = tokenize.NewMultilineConfig -// NewMultilineConfig creates a new Multiline config -func NewMultilineConfig() MultilineConfig { - return MultilineConfig{ - LineStartPattern: "", - LineEndPattern: "", - } -} +// Deprecated: [v0.84.0] Use tokenize.MultilineConfig instead +type MultilineConfig = tokenize.MultilineConfig -// MultilineConfig is the configuration of a multiline helper -type MultilineConfig struct { - LineStartPattern string `mapstructure:"line_start_pattern"` - LineEndPattern string `mapstructure:"line_end_pattern"` -} +// Deprecated: [v0.84.0] Use tokenize.NewLineStartSplitFunc instead +var NewLineStartSplitFunc = tokenize.NewLineStartSplitFunc -// Build will build a Multiline operator. -func (c MultilineConfig) Build(enc encoding.Encoding, flushAtEOF, preserveLeadingWhitespaces, preserveTrailingWhitespaces bool, force *Flusher, maxLogSize int) (bufio.SplitFunc, error) { - return c.getSplitFunc(enc, flushAtEOF, force, maxLogSize, preserveLeadingWhitespaces, preserveTrailingWhitespaces) -} +// Deprecated: [v0.84.0] Use tokenize.NewLineEndSplitFunc instead +var NewLineEndSplitFunc = tokenize.NewLineEndSplitFunc -// getSplitFunc returns split function for bufio.Scanner basing on configured pattern -func (c MultilineConfig) getSplitFunc(enc encoding.Encoding, flushAtEOF bool, force *Flusher, maxLogSize int, preserveLeadingWhitespaces, preserveTrailingWhitespaces bool) (bufio.SplitFunc, error) { - endPattern := c.LineEndPattern - startPattern := c.LineStartPattern - - var ( - splitFunc bufio.SplitFunc - err error - ) - - switch { - case endPattern != "" && startPattern != "": - return nil, fmt.Errorf("only one of line_start_pattern or line_end_pattern can be set") - case enc == encoding.Nop && (endPattern != "" || startPattern != ""): - return nil, fmt.Errorf("line_start_pattern or line_end_pattern should not be set when using nop encoding") - case enc == encoding.Nop: - return SplitNone(maxLogSize), nil - case endPattern == "" && startPattern == "": - splitFunc, err = NewNewlineSplitFunc(enc, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) - if err != nil { - return nil, err - } - case endPattern != "": - re, err := regexp.Compile("(?m)" + c.LineEndPattern) - if err != nil { - return nil, fmt.Errorf("compile line end regex: %w", err) - } - splitFunc = NewLineEndSplitFunc(re, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) - case startPattern != "": - re, err := regexp.Compile("(?m)" + c.LineStartPattern) - if err != nil { - return nil, fmt.Errorf("compile line start regex: %w", err) - } - splitFunc = NewLineStartSplitFunc(re, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) - default: - return nil, fmt.Errorf("unreachable") - } - - if force != nil { - return force.SplitFunc(splitFunc), nil - } - - return splitFunc, nil -} - -// NewLineStartSplitFunc creates a bufio.SplitFunc that splits an incoming stream into -// tokens that start with a match to the regex pattern provided -func NewLineStartSplitFunc(re *regexp.Regexp, flushAtEOF bool, trimFunc trimFunc) bufio.SplitFunc { - return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - firstLoc := re.FindIndex(data) - if firstLoc == nil { - // Flush if no more data is expected - if len(data) != 0 && atEOF && flushAtEOF { - token = trimFunc(data) - advance = len(data) - return - } - return 0, nil, nil // read more data and try again. - } - firstMatchStart := firstLoc[0] - firstMatchEnd := firstLoc[1] - - if firstMatchStart != 0 { - // the beginning of the file does not match the start pattern, so return a token up to the first match so we don't lose data - advance = firstMatchStart - token = trimFunc(data[0:firstMatchStart]) - - // return if non-matching pattern is not only whitespaces - if token != nil { - return - } - } - - if firstMatchEnd == len(data) { - // the first match goes to the end of the bufer, so don't look for a second match - return 0, nil, nil - } - - // Flush if no more data is expected - if atEOF && flushAtEOF { - token = trimFunc(data) - advance = len(data) - return - } - - secondLocOfset := firstMatchEnd + 1 - secondLoc := re.FindIndex(data[secondLocOfset:]) - if secondLoc == nil { - return 0, nil, nil // read more data and try again - } - secondMatchStart := secondLoc[0] + secondLocOfset - - advance = secondMatchStart // start scanning at the beginning of the second match - token = trimFunc(data[firstMatchStart:secondMatchStart]) // the token begins at the first match, and ends at the beginning of the second match - err = nil - return - } -} - -// NewLineEndSplitFunc creates a bufio.SplitFunc that splits an incoming stream into -// tokens that end with a match to the regex pattern provided -func NewLineEndSplitFunc(re *regexp.Regexp, flushAtEOF bool, trimFunc trimFunc) bufio.SplitFunc { - return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - loc := re.FindIndex(data) - if loc == nil { - // Flush if no more data is expected - if len(data) != 0 && atEOF && flushAtEOF { - token = trimFunc(data) - advance = len(data) - return - } - return 0, nil, nil // read more data and try again - } - - // If the match goes up to the end of the current bufer, do another - // read until we can capture the entire match - if loc[1] == len(data)-1 && !atEOF { - return 0, nil, nil - } - - advance = loc[1] - token = trimFunc(data[:loc[1]]) - err = nil - return - } -} - -// NewNewlineSplitFunc splits log lines by newline, just as bufio.ScanLines, but -// never returning an token using EOF as a terminator -func NewNewlineSplitFunc(enc encoding.Encoding, flushAtEOF bool, trimFunc trimFunc) (bufio.SplitFunc, error) { - newline, err := encodedNewline(enc) - if err != nil { - return nil, err - } - - carriageReturn, err := encodedCarriageReturn(enc) - if err != nil { - return nil, err - } - - return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - if atEOF && len(data) == 0 { - return 0, nil, nil - } - - if i := bytes.Index(data, newline); i >= 0 { - // We have a full newline-terminated line. - token = bytes.TrimSuffix(data[:i], carriageReturn) - - return i + len(newline), trimFunc(token), nil - } - - // Flush if no more data is expected - if atEOF && flushAtEOF { - token = trimFunc(data) - advance = len(data) - return - } - - // Request more data. - return 0, nil, nil - }, nil -} - -func encodedNewline(enc encoding.Encoding) ([]byte, error) { - out := make([]byte, 10) - nDst, _, err := enc.NewEncoder().Transform(out, []byte{'\n'}, true) - return out[:nDst], err -} - -func encodedCarriageReturn(enc encoding.Encoding) ([]byte, error) { - out := make([]byte, 10) - nDst, _, err := enc.NewEncoder().Transform(out, []byte{'\r'}, true) - return out[:nDst], err -} - -type trimFunc func([]byte) []byte - -func noTrim(token []byte) []byte { - return token -} - -func trimLeadingWhitespacesFunc(data []byte) []byte { - // TrimLeft to strip EOF whitespaces in case of using $ in regex - // For some reason newline and carriage return are being moved to beginning of next log - token := bytes.TrimLeft(data, "\r\n\t ") - if token == nil { - return []byte{} - } - return token -} - -func trimTrailingWhitespacesFunc(data []byte) []byte { - // TrimRight to strip all whitespaces from the end of log - token := bytes.TrimRight(data, "\r\n\t ") - if token == nil { - return []byte{} - } - return token -} - -func trimWhitespacesFunc(data []byte) []byte { - return trimLeadingWhitespacesFunc(trimTrailingWhitespacesFunc(data)) -} - -func getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces bool) trimFunc { - if preserveLeadingWhitespaces && preserveTrailingWhitespaces { - return noTrim - } - if preserveLeadingWhitespaces { - return trimTrailingWhitespacesFunc - } - if preserveTrailingWhitespaces { - return trimLeadingWhitespacesFunc - } - return trimWhitespacesFunc -} +// Deprecated: [v0.84.0] Use tokenize.NewNewlineSplitFunc instead +var NewNewlineSplitFunc = tokenize.NewNewlineSplitFunc diff --git a/pkg/stanza/operator/helper/splitter.go b/pkg/stanza/operator/helper/splitter.go index 830d0de6c881..d584aee934c2 100644 --- a/pkg/stanza/operator/helper/splitter.go +++ b/pkg/stanza/operator/helper/splitter.go @@ -3,67 +3,16 @@ package helper // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" -import "bufio" +import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" -// SplitterConfig consolidates MultilineConfig and FlusherConfig -type SplitterConfig struct { - EncodingConfig EncodingConfig `mapstructure:",squash,omitempty"` - Flusher FlusherConfig `mapstructure:",squash,omitempty"` - Multiline MultilineConfig `mapstructure:"multiline,omitempty"` - PreserveLeadingWhitespaces bool `mapstructure:"preserve_leading_whitespaces,omitempty"` - PreserveTrailingWhitespaces bool `mapstructure:"preserve_trailing_whitespaces,omitempty"` -} +// Deprecated: [v0.84.0] Use tokenize.SplitterConfig instead +type SplitterConfig = tokenize.SplitterConfig -// NewSplitterConfig returns default SplitterConfig -func NewSplitterConfig() SplitterConfig { - return SplitterConfig{ - EncodingConfig: NewEncodingConfig(), - Multiline: NewMultilineConfig(), - Flusher: NewFlusherConfig(), - } -} +// Deprecated: [v0.84.0] Use tokenize.NewSplitterConfig instead +var NewSplitterConfig = tokenize.NewSplitterConfig -// Build builds Splitter struct -func (c *SplitterConfig) Build(flushAtEOF bool, maxLogSize int) (*Splitter, error) { - enc, err := LookupEncoding(c.EncodingConfig.Encoding) - if err != nil { - return nil, err - } +// Deprecated: [v0.84.0] Use tokenize.Splitter instead +type Splitter = tokenize.Splitter - flusher := c.Flusher.Build() - splitFunc, err := c.Multiline.Build(enc, flushAtEOF, c.PreserveLeadingWhitespaces, c.PreserveTrailingWhitespaces, flusher, maxLogSize) - if err != nil { - return nil, err - } - - return &Splitter{ - Decoder: NewDecoder(enc), - Flusher: flusher, - SplitFunc: splitFunc, - }, nil -} - -// Splitter consolidates Flusher and dependent splitFunc -type Splitter struct { - Decoder *Decoder - SplitFunc bufio.SplitFunc - Flusher *Flusher -} - -// SplitNone doesn't split any of the bytes, it reads in all of the bytes and returns it all at once. This is for when the encoding is nop -func SplitNone(maxLogSize int) bufio.SplitFunc { - return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - if len(data) >= maxLogSize { - return maxLogSize, data[:maxLogSize], nil - } - - if !atEOF { - return 0, nil, nil - } - - if len(data) == 0 { - return 0, nil, nil - } - return len(data), data, nil - } -} +// Deprecated: [v0.84.0] Use tokenize.SplitNone instead +var SplitNone = tokenize.SplitNone diff --git a/pkg/stanza/operator/input/file/config.go b/pkg/stanza/operator/input/file/config.go index bada0607bcae..589d3c962bc4 100644 --- a/pkg/stanza/operator/input/file/config.go +++ b/pkg/stanza/operator/input/file/config.go @@ -6,6 +6,7 @@ package file // import "github.com/open-telemetry/opentelemetry-collector-contri import ( "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" @@ -46,7 +47,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) { var toBody toBodyFunc = func(token []byte) interface{} { return string(token) } - if helper.IsNop(c.Config.Splitter.EncodingConfig.Encoding) { + if decoder.IsNop(c.Config.Splitter.Encoding) { toBody = func(token []byte) interface{} { copied := make([]byte, len(token)) copy(copied, token) diff --git a/pkg/stanza/operator/input/file/config_test.go b/pkg/stanza/operator/input/file/config_test.go index bd6c06d627b9..5b45a021230a 100644 --- a/pkg/stanza/operator/input/file/config_test.go +++ b/pkg/stanza/operator/input/file/config_test.go @@ -14,6 +14,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/operatortest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestUnmarshal(t *testing.T) { @@ -314,7 +315,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineStartPattern = "Start" cfg.Splitter = newSplit return cfg @@ -325,7 +326,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineStartPattern = "%" cfg.Splitter = newSplit return cfg @@ -336,7 +337,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineEndPattern = "Start" cfg.Splitter = newSplit return cfg @@ -347,7 +348,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - newSplit := helper.NewSplitterConfig() + newSplit := tokenize.NewSplitterConfig() newSplit.Multiline.LineEndPattern = "%" cfg.Splitter = newSplit return cfg @@ -412,7 +413,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - cfg.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "utf-16le"} + cfg.Splitter.Encoding = "utf-16le" return cfg }(), }, @@ -421,7 +422,7 @@ func TestUnmarshal(t *testing.T) { ExpectErr: false, Expect: func() *Config { cfg := NewConfig() - cfg.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "UTF-16lE"} + cfg.Splitter.Encoding = "UTF-16lE" return cfg }(), }, @@ -475,8 +476,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredStartAndEndPatterns", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "Exists", LineStartPattern: "Exists", } @@ -487,8 +488,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredStartPattern", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: "START.*", } }, @@ -498,8 +499,8 @@ func TestBuild(t *testing.T) { { "MultilineConfiguredEndPattern", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "END.*", } }, @@ -509,7 +510,7 @@ func TestBuild(t *testing.T) { { "InvalidEncoding", func(f *Config) { - f.Splitter.EncodingConfig = helper.EncodingConfig{Encoding: "UTF-3233"} + f.Splitter.Encoding = "UTF-3233" }, require.Error, nil, @@ -517,8 +518,8 @@ func TestBuild(t *testing.T) { { "LineStartAndEnd", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: ".*", LineEndPattern: ".*", } @@ -529,8 +530,8 @@ func TestBuild(t *testing.T) { { "NoLineStartOrEnd", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{} + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{} }, require.NoError, func(t *testing.T, f *Input) {}, @@ -538,8 +539,8 @@ func TestBuild(t *testing.T) { { "InvalidLineStartRegex", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineStartPattern: "(", } }, @@ -549,8 +550,8 @@ func TestBuild(t *testing.T) { { "InvalidLineEndRegex", func(f *Config) { - f.Splitter = helper.NewSplitterConfig() - f.Splitter.Multiline = helper.MultilineConfig{ + f.Splitter = tokenize.NewSplitterConfig() + f.Splitter.Multiline = tokenize.MultilineConfig{ LineEndPattern: "(", } }, diff --git a/pkg/stanza/operator/input/file/file_test.go b/pkg/stanza/operator/input/file/file_test.go index 8fced8146474..c02104a5652e 100644 --- a/pkg/stanza/operator/input/file/file_test.go +++ b/pkg/stanza/operator/input/file/file_test.go @@ -133,7 +133,7 @@ func TestReadUsingNopEncoding(t *testing.T) { t.Run(tc.testName, func(t *testing.T) { operator, logReceived, tempDir := newTestFileOperator(t, func(cfg *Config) { cfg.MaxLogSize = 8 - cfg.Splitter.EncodingConfig.Encoding = "nop" + cfg.Splitter.Encoding = "nop" }) // Create a file, then start temp := openTemp(t, tempDir) diff --git a/pkg/stanza/operator/input/journald/journald.go b/pkg/stanza/operator/input/journald/journald.go index 8207b669f676..66ee3be7ccfb 100644 --- a/pkg/stanza/operator/input/journald/journald.go +++ b/pkg/stanza/operator/input/journald/journald.go @@ -53,13 +53,15 @@ func NewConfigWithID(operatorID string) *Config { type Config struct { helper.InputConfig `mapstructure:",squash"` - Directory *string `mapstructure:"directory,omitempty"` - Files []string `mapstructure:"files,omitempty"` - StartAt string `mapstructure:"start_at,omitempty"` - Units []string `mapstructure:"units,omitempty"` - Priority string `mapstructure:"priority,omitempty"` - Matches []MatchConfig `mapstructure:"matches,omitempty"` - Grep string `mapstructure:"grep,omitempty"` + Directory *string `mapstructure:"directory,omitempty"` + Files []string `mapstructure:"files,omitempty"` + StartAt string `mapstructure:"start_at,omitempty"` + Units []string `mapstructure:"units,omitempty"` + Priority string `mapstructure:"priority,omitempty"` + Matches []MatchConfig `mapstructure:"matches,omitempty"` + Identifiers []string `mapstructure:"identifiers,omitempty"` + Grep string `mapstructure:"grep,omitempty"` + Dmesg bool `mapstructure:"dmesg,omitempty"` } type MatchConfig map[string]string @@ -113,12 +115,20 @@ func (c Config) buildArgs() ([]string, error) { args = append(args, "--unit", unit) } + for _, identifier := range c.Identifiers { + args = append(args, "--identifier", identifier) + } + args = append(args, "--priority", c.Priority) if len(c.Grep) > 0 { args = append(args, "--grep", c.Grep) } + if c.Dmesg { + args = append(args, "--dmesg") + } + switch { case c.Directory != nil: args = append(args, "--directory", *c.Directory) diff --git a/pkg/stanza/operator/input/journald/journald_test.go b/pkg/stanza/operator/input/journald/journald_test.go index 2b6de15543ba..178f0571041a 100644 --- a/pkg/stanza/operator/input/journald/journald_test.go +++ b/pkg/stanza/operator/input/journald/journald_test.go @@ -183,6 +183,13 @@ func TestBuildConfig(t *testing.T) { }, Expected: []string{"--utc", "--output=json", "--follow", "--unit", "ssh", "--priority", "info", "_SYSTEMD_UNIT=dbus.service"}, }, + { + Name: "identifiers", + Config: func(cfg *Config) { + cfg.Identifiers = []string{"wireplumber", "systemd"} + }, + Expected: []string{"--utc", "--output=json", "--follow", "--identifier", "wireplumber", "--identifier", "systemd", "--priority", "info"}, + }, { Name: "grep", Config: func(cfg *Config) { @@ -190,6 +197,13 @@ func TestBuildConfig(t *testing.T) { }, Expected: []string{"--utc", "--output=json", "--follow", "--priority", "info", "--grep", "test_grep"}, }, + { + Name: "dmesg", + Config: func(cfg *Config) { + cfg.Dmesg = true + }, + Expected: []string{"--utc", "--output=json", "--follow", "--priority", "info", "--dmesg"}, + }, } for _, tt := range testCases { diff --git a/pkg/stanza/operator/input/syslog/config_test.go b/pkg/stanza/operator/input/syslog/config_test.go index f1564481b651..547c9a5cd56a 100644 --- a/pkg/stanza/operator/input/syslog/config_test.go +++ b/pkg/stanza/operator/input/syslog/config_test.go @@ -9,10 +9,10 @@ import ( "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/tcp" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/udp" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/operatortest" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestUnmarshal(t *testing.T) { @@ -37,9 +37,8 @@ func TestUnmarshal(t *testing.T) { cfg.TCP.MaxLogSize = 1000000 cfg.TCP.ListenAddress = "10.0.0.1:9000" cfg.TCP.AddAttributes = true - cfg.TCP.Encoding = helper.NewEncodingConfig() - cfg.TCP.Encoding.Encoding = "utf-16" - cfg.TCP.Multiline = helper.NewMultilineConfig() + cfg.TCP.Encoding = "utf-16" + cfg.TCP.Multiline = tokenize.NewMultilineConfig() cfg.TCP.Multiline.LineStartPattern = "ABC" cfg.TCP.TLS = &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -62,9 +61,8 @@ func TestUnmarshal(t *testing.T) { cfg.UDP = &udp.NewConfig().BaseConfig cfg.UDP.ListenAddress = "10.0.0.1:9000" cfg.UDP.AddAttributes = true - cfg.UDP.Encoding = helper.NewEncodingConfig() - cfg.UDP.Encoding.Encoding = "utf-16" - cfg.UDP.Multiline = helper.NewMultilineConfig() + cfg.UDP.Encoding = "utf-16" + cfg.UDP.Multiline = tokenize.NewMultilineConfig() cfg.UDP.Multiline.LineStartPattern = "ABC" return cfg }(), diff --git a/pkg/stanza/operator/input/syslog/syslog_test.go b/pkg/stanza/operator/input/syslog/syslog_test.go index d65d81a86457..a19e763cc01c 100644 --- a/pkg/stanza/operator/input/syslog/syslog_test.go +++ b/pkg/stanza/operator/input/syslog/syslog_test.go @@ -15,10 +15,10 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/tcp" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/udp" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/syslog" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/pipeline" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize/tokenizetest" ) var ( @@ -182,68 +182,68 @@ func NewConfigWithUDP(syslogCfg *syslog.BaseConfig) *Config { } func TestOctetFramingSplitFunc(t *testing.T) { - testCases := []internal.TokenizerTestCase{ + testCases := []tokenizetest.TestCase{ { - Name: "OneLogSimple", - Raw: []byte(`17 my log LOGEND 123`), - ExpectedTokenized: []string{ + Name: "OneLogSimple", + Input: []byte(`17 my log LOGEND 123`), + ExpectedTokens: []string{ `17 my log LOGEND 123`, }, }, { - Name: "TwoLogsSimple", - Raw: []byte(`17 my log LOGEND 12317 my log LOGEND 123`), - ExpectedTokenized: []string{ + Name: "TwoLogsSimple", + Input: []byte(`17 my log LOGEND 12317 my log LOGEND 123`), + ExpectedTokens: []string{ `17 my log LOGEND 123`, `17 my log LOGEND 123`, }, }, { - Name: "NoMatches", - Raw: []byte(`no matches in it`), - ExpectedTokenized: []string{ + Name: "NoMatches", + Input: []byte(`no matches in it`), + ExpectedTokens: []string{ `no matches in it`, }, }, { - Name: "NonMatchesAfter", - Raw: []byte(`17 my log LOGEND 123my log LOGEND 12317 my log LOGEND 123`), - ExpectedTokenized: []string{ + Name: "NonMatchesAfter", + Input: []byte(`17 my log LOGEND 123my log LOGEND 12317 my log LOGEND 123`), + ExpectedTokens: []string{ `17 my log LOGEND 123`, `my log LOGEND 12317 my log LOGEND 123`, }, }, { Name: "HugeLog100", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(100) + Input: func() []byte { + newRaw := tokenizetest.GenerateBytes(100) newRaw = append([]byte(`100 `), newRaw...) return newRaw }(), - ExpectedTokenized: []string{ - `100 ` + string(internal.GeneratedByteSliceOfLength(100)), + ExpectedTokens: []string{ + `100 ` + string(tokenizetest.GenerateBytes(100)), }, }, { Name: "maxCapacity", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(4091) + Input: func() []byte { + newRaw := tokenizetest.GenerateBytes(4091) newRaw = append([]byte(`4091 `), newRaw...) return newRaw }(), - ExpectedTokenized: []string{ - `4091 ` + string(internal.GeneratedByteSliceOfLength(4091)), + ExpectedTokens: []string{ + `4091 ` + string(tokenizetest.GenerateBytes(4091)), }, }, { Name: "over capacity", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(4092) + Input: func() []byte { + newRaw := tokenizetest.GenerateBytes(4092) newRaw = append([]byte(`5000 `), newRaw...) return newRaw }(), - ExpectedTokenized: []string{ - `5000 ` + string(internal.GeneratedByteSliceOfLength(4091)), + ExpectedTokens: []string{ + `5000 ` + string(tokenizetest.GenerateBytes(4091)), `j`, }, }, @@ -251,6 +251,8 @@ func TestOctetFramingSplitFunc(t *testing.T) { for _, tc := range testCases { splitFunc, err := OctetMultiLineBuilder(nil) require.NoError(t, err) - t.Run(tc.Name, tc.RunFunc(splitFunc)) + t.Run(tc.Name, tc.Run(splitFunc)) } } + +// TODO refactor test dependency away from internal? diff --git a/pkg/stanza/operator/input/tcp/config_test.go b/pkg/stanza/operator/input/tcp/config_test.go index 6dac92eb7a88..8a37688ab62f 100644 --- a/pkg/stanza/operator/input/tcp/config_test.go +++ b/pkg/stanza/operator/input/tcp/config_test.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/operatortest" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestUnmarshal(t *testing.T) { @@ -31,9 +31,8 @@ func TestUnmarshal(t *testing.T) { cfg.MaxLogSize = 1000000 cfg.ListenAddress = "10.0.0.1:9000" cfg.AddAttributes = true - cfg.Encoding = helper.NewEncodingConfig() - cfg.Encoding.Encoding = "utf-8" - cfg.Multiline = helper.NewMultilineConfig() + cfg.Encoding = "utf-8" + cfg.Multiline = tokenize.NewMultilineConfig() cfg.Multiline.LineStartPattern = "ABC" cfg.TLS = &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/pkg/stanza/operator/input/tcp/tcp.go b/pkg/stanza/operator/input/tcp/tcp.go index 2f8c3d410ced..caf6da6baf0d 100644 --- a/pkg/stanza/operator/input/tcp/tcp.go +++ b/pkg/stanza/operator/input/tcp/tcp.go @@ -21,8 +21,10 @@ import ( "go.uber.org/zap" "golang.org/x/text/encoding" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) const ( @@ -52,8 +54,8 @@ func NewConfigWithID(operatorID string) *Config { InputConfig: helper.NewInputConfig(operatorID, operatorType), BaseConfig: BaseConfig{ OneLogPerPacket: false, - Multiline: helper.NewMultilineConfig(), - Encoding: helper.NewEncodingConfig(), + Multiline: tokenize.NewMultilineConfig(), + Encoding: "utf-8", }, } } @@ -71,8 +73,8 @@ type BaseConfig struct { TLS *configtls.TLSServerSetting `mapstructure:"tls,omitempty"` AddAttributes bool `mapstructure:"add_attributes,omitempty"` OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` - Encoding helper.EncodingConfig `mapstructure:",squash,omitempty"` - Multiline helper.MultilineConfig `mapstructure:"multiline,omitempty"` + Encoding string `mapstructure:"encoding,omitempty"` + Multiline tokenize.MultilineConfig `mapstructure:"multiline,omitempty"` PreserveLeadingWhitespaces bool `mapstructure:"preserve_leading_whitespaces,omitempty"` PreserveTrailingWhitespaces bool `mapstructure:"preserve_trailing_whitespaces,omitempty"` MultiLineBuilder MultiLineBuilderFunc @@ -113,7 +115,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) { return nil, fmt.Errorf("failed to resolve listen_address: %w", err) } - enc, err := helper.LookupEncoding(c.Encoding.Encoding) + enc, err := decoder.LookupEncoding(c.Encoding) if err != nil { return nil, err } @@ -261,7 +263,7 @@ func (t *Input) goHandleMessages(ctx context.Context, conn net.Conn, cancel cont defer t.wg.Done() defer cancel() - decoder := helper.NewDecoder(t.encoding) + dec := decoder.New(t.encoding) if t.OneLogPerPacket { var buf bytes.Buffer @@ -270,7 +272,7 @@ func (t *Input) goHandleMessages(ctx context.Context, conn net.Conn, cancel cont t.Errorw("IO copy net connection buffer error", zap.Error(err)) } log := truncateMaxLog(buf.Bytes(), t.MaxLogSize) - t.handleMessage(ctx, conn, decoder, log) + t.handleMessage(ctx, conn, dec, log) return } @@ -282,7 +284,7 @@ func (t *Input) goHandleMessages(ctx context.Context, conn net.Conn, cancel cont scanner.Split(t.splitFunc) for scanner.Scan() { - t.handleMessage(ctx, conn, decoder, scanner.Bytes()) + t.handleMessage(ctx, conn, dec, scanner.Bytes()) } if err := scanner.Err(); err != nil { @@ -291,8 +293,8 @@ func (t *Input) goHandleMessages(ctx context.Context, conn net.Conn, cancel cont }() } -func (t *Input) handleMessage(ctx context.Context, conn net.Conn, decoder *helper.Decoder, log []byte) { - decoded, err := decoder.Decode(log) +func (t *Input) handleMessage(ctx context.Context, conn net.Conn, dec *decoder.Decoder, log []byte) { + decoded, err := dec.Decode(log) if err != nil { t.Errorw("Failed to decode data", zap.Error(err)) return diff --git a/pkg/stanza/operator/input/udp/config_test.go b/pkg/stanza/operator/input/udp/config_test.go index a65b6c036a5d..6671d5db34ce 100644 --- a/pkg/stanza/operator/input/udp/config_test.go +++ b/pkg/stanza/operator/input/udp/config_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/operatortest" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) func TestUnmarshal(t *testing.T) { @@ -28,9 +28,8 @@ func TestUnmarshal(t *testing.T) { cfg := NewConfig() cfg.ListenAddress = "10.0.0.1:9000" cfg.AddAttributes = true - cfg.Encoding = helper.NewEncodingConfig() - cfg.Encoding.Encoding = "utf-8" - cfg.Multiline = helper.NewMultilineConfig() + cfg.Encoding = "utf-8" + cfg.Multiline = tokenize.NewMultilineConfig() cfg.Multiline.LineStartPattern = "ABC" return cfg }(), diff --git a/pkg/stanza/operator/input/udp/udp.go b/pkg/stanza/operator/input/udp/udp.go index 4428c2b3eb12..e92142dc54dd 100644 --- a/pkg/stanza/operator/input/udp/udp.go +++ b/pkg/stanza/operator/input/udp/udp.go @@ -15,8 +15,10 @@ import ( "go.uber.org/zap" "golang.org/x/text/encoding" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" ) const ( @@ -40,9 +42,9 @@ func NewConfigWithID(operatorID string) *Config { return &Config{ InputConfig: helper.NewInputConfig(operatorID, operatorType), BaseConfig: BaseConfig{ - Encoding: helper.NewEncodingConfig(), + Encoding: "utf-8", OneLogPerPacket: false, - Multiline: helper.MultilineConfig{ + Multiline: tokenize.MultilineConfig{ LineStartPattern: "", LineEndPattern: ".^", // Use never matching regex to not split data by default }, @@ -58,13 +60,13 @@ type Config struct { // BaseConfig is the details configuration of a udp input operator. type BaseConfig struct { - ListenAddress string `mapstructure:"listen_address,omitempty"` - OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` - AddAttributes bool `mapstructure:"add_attributes,omitempty"` - Encoding helper.EncodingConfig `mapstructure:",squash,omitempty"` - Multiline helper.MultilineConfig `mapstructure:"multiline,omitempty"` - PreserveLeadingWhitespaces bool `mapstructure:"preserve_leading_whitespaces,omitempty"` - PreserveTrailingWhitespaces bool `mapstructure:"preserve_trailing_whitespaces,omitempty"` + ListenAddress string `mapstructure:"listen_address,omitempty"` + OneLogPerPacket bool `mapstructure:"one_log_per_packet,omitempty"` + AddAttributes bool `mapstructure:"add_attributes,omitempty"` + Encoding string `mapstructure:"encoding,omitempty"` + Multiline tokenize.MultilineConfig `mapstructure:"multiline,omitempty"` + PreserveLeadingWhitespaces bool `mapstructure:"preserve_leading_whitespaces,omitempty"` + PreserveTrailingWhitespaces bool `mapstructure:"preserve_trailing_whitespaces,omitempty"` } // Build will build a udp input operator. @@ -83,7 +85,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) { return nil, fmt.Errorf("failed to resolve listen_address: %w", err) } - enc, err := helper.LookupEncoding(c.Encoding.Encoding) + enc, err := decoder.LookupEncoding(c.Encoding) if err != nil { return nil, err } @@ -151,7 +153,7 @@ func (u *Input) goHandleMessages(ctx context.Context) { go func() { defer u.wg.Done() - decoder := helper.NewDecoder(u.encoding) + dec := decoder.New(u.encoding) buf := make([]byte, 0, MaxUDPSize) for { message, remoteAddr, err := u.readMessage() @@ -167,7 +169,7 @@ func (u *Input) goHandleMessages(ctx context.Context) { if u.OneLogPerPacket { log := truncateMaxLog(message) - u.handleMessage(ctx, remoteAddr, decoder, log) + u.handleMessage(ctx, remoteAddr, dec, log) continue } @@ -177,7 +179,7 @@ func (u *Input) goHandleMessages(ctx context.Context) { scanner.Split(u.splitFunc) for scanner.Scan() { - u.handleMessage(ctx, remoteAddr, decoder, scanner.Bytes()) + u.handleMessage(ctx, remoteAddr, dec, scanner.Bytes()) } if err := scanner.Err(); err != nil { u.Errorw("Scanner error", zap.Error(err)) @@ -198,8 +200,8 @@ func truncateMaxLog(data []byte) (token []byte) { return data } -func (u *Input) handleMessage(ctx context.Context, remoteAddr net.Addr, decoder *helper.Decoder, log []byte) { - decoded, err := decoder.Decode(log) +func (u *Input) handleMessage(ctx context.Context, remoteAddr net.Addr, dec *decoder.Decoder, log []byte) { + decoded, err := dec.Decode(log) if err != nil { u.Errorw("Failed to decode data", zap.Error(err)) return diff --git a/pkg/stanza/tokenize/flusher.go b/pkg/stanza/tokenize/flusher.go new file mode 100644 index 000000000000..922606179e5a --- /dev/null +++ b/pkg/stanza/tokenize/flusher.go @@ -0,0 +1,100 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package tokenize // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" + +import ( + "bufio" + "time" +) + +// FlusherConfig is a configuration of Flusher helper +type FlusherConfig struct { + Period time.Duration `mapstructure:"force_flush_period"` +} + +// NewFlusherConfig creates a default Flusher config +func NewFlusherConfig() FlusherConfig { + return FlusherConfig{ + // Empty or `0s` means that we will never force flush + Period: time.Millisecond * 500, + } +} + +// Build creates Flusher from configuration +func (c *FlusherConfig) Build() *Flusher { + return &Flusher{ + lastDataChange: time.Now(), + forcePeriod: c.Period, + previousDataLength: 0, + } +} + +// Flusher keeps information about flush state +type Flusher struct { + // forcePeriod defines time from last flush which should pass before setting force to true. + // Never forces if forcePeriod is set to 0 + forcePeriod time.Duration + + // lastDataChange tracks date of last data change (including new data and flushes) + lastDataChange time.Time + + // previousDataLength: + // if previousDataLength = 0 - no new data have been received after flush + // if previousDataLength > 0 - there is data which has not been flushed yet and it doesn't changed since lastDataChange + previousDataLength int +} + +func (f *Flusher) UpdateDataChangeTime(length int) { + // Skip if length is greater than 0 and didn't changed + if length > 0 && length == f.previousDataLength { + return + } + + // update internal properties with new values if data length changed + // because it means that data is flowing and being processed + f.previousDataLength = length + f.lastDataChange = time.Now() +} + +// Flushed reset data length +func (f *Flusher) Flushed() { + f.UpdateDataChangeTime(0) +} + +// ShouldFlush returns true if data should be forcefully flushed +func (f *Flusher) ShouldFlush() bool { + // Returns true if there is f.forcePeriod after f.lastDataChange and data length is greater than 0 + return f.forcePeriod > 0 && time.Since(f.lastDataChange) > f.forcePeriod && f.previousDataLength > 0 +} + +func (f *Flusher) SplitFunc(splitFunc bufio.SplitFunc) bufio.SplitFunc { + return func(data []byte, atEOF bool) (advance int, token []byte, err error) { + advance, token, err = splitFunc(data, atEOF) + + // Return as it is in case of error + if err != nil { + return + } + + // Return token + if token != nil { + // Inform flusher that we just flushed + f.Flushed() + return + } + + // If there is no token, force flush eventually + if f.ShouldFlush() { + // Inform flusher that we just flushed + f.Flushed() + token = trimWhitespacesFunc(data) + advance = len(data) + return + } + + // Inform flusher that we didn't flushed + f.UpdateDataChangeTime(len(data)) + return + } +} diff --git a/pkg/stanza/tokenize/multiline.go b/pkg/stanza/tokenize/multiline.go new file mode 100644 index 000000000000..99682334e208 --- /dev/null +++ b/pkg/stanza/tokenize/multiline.go @@ -0,0 +1,256 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package tokenize // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" + +import ( + "bufio" + "bytes" + "fmt" + "regexp" + + "golang.org/x/text/encoding" +) + +// Multiline consists of splitFunc and variables needed to perform force flush +type Multiline struct { + SplitFunc bufio.SplitFunc + Force *Flusher +} + +// NewMultilineConfig creates a new Multiline config +func NewMultilineConfig() MultilineConfig { + return MultilineConfig{ + LineStartPattern: "", + LineEndPattern: "", + } +} + +// MultilineConfig is the configuration of a multiline helper +type MultilineConfig struct { + LineStartPattern string `mapstructure:"line_start_pattern"` + LineEndPattern string `mapstructure:"line_end_pattern"` +} + +// Build will build a Multiline operator. +func (c MultilineConfig) Build(enc encoding.Encoding, flushAtEOF, preserveLeadingWhitespaces, preserveTrailingWhitespaces bool, force *Flusher, maxLogSize int) (bufio.SplitFunc, error) { + return c.getSplitFunc(enc, flushAtEOF, force, maxLogSize, preserveLeadingWhitespaces, preserveTrailingWhitespaces) +} + +// getSplitFunc returns split function for bufio.Scanner basing on configured pattern +func (c MultilineConfig) getSplitFunc(enc encoding.Encoding, flushAtEOF bool, force *Flusher, maxLogSize int, preserveLeadingWhitespaces, preserveTrailingWhitespaces bool) (bufio.SplitFunc, error) { + endPattern := c.LineEndPattern + startPattern := c.LineStartPattern + + var ( + splitFunc bufio.SplitFunc + err error + ) + + switch { + case endPattern != "" && startPattern != "": + return nil, fmt.Errorf("only one of line_start_pattern or line_end_pattern can be set") + case enc == encoding.Nop && (endPattern != "" || startPattern != ""): + return nil, fmt.Errorf("line_start_pattern or line_end_pattern should not be set when using nop encoding") + case enc == encoding.Nop: + return SplitNone(maxLogSize), nil + case endPattern == "" && startPattern == "": + splitFunc, err = NewNewlineSplitFunc(enc, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) + if err != nil { + return nil, err + } + case endPattern != "": + re, err := regexp.Compile("(?m)" + c.LineEndPattern) + if err != nil { + return nil, fmt.Errorf("compile line end regex: %w", err) + } + splitFunc = NewLineEndSplitFunc(re, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) + case startPattern != "": + re, err := regexp.Compile("(?m)" + c.LineStartPattern) + if err != nil { + return nil, fmt.Errorf("compile line start regex: %w", err) + } + splitFunc = NewLineStartSplitFunc(re, flushAtEOF, getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces)) + default: + return nil, fmt.Errorf("unreachable") + } + + if force != nil { + return force.SplitFunc(splitFunc), nil + } + + return splitFunc, nil +} + +// NewLineStartSplitFunc creates a bufio.SplitFunc that splits an incoming stream into +// tokens that start with a match to the regex pattern provided +func NewLineStartSplitFunc(re *regexp.Regexp, flushAtEOF bool, trimFunc trimFunc) bufio.SplitFunc { + return func(data []byte, atEOF bool) (advance int, token []byte, err error) { + firstLoc := re.FindIndex(data) + if firstLoc == nil { + // Flush if no more data is expected + if len(data) != 0 && atEOF && flushAtEOF { + token = trimFunc(data) + advance = len(data) + return + } + return 0, nil, nil // read more data and try again. + } + firstMatchStart := firstLoc[0] + firstMatchEnd := firstLoc[1] + + if firstMatchStart != 0 { + // the beginning of the file does not match the start pattern, so return a token up to the first match so we don't lose data + advance = firstMatchStart + token = trimFunc(data[0:firstMatchStart]) + + // return if non-matching pattern is not only whitespaces + if token != nil { + return + } + } + + if firstMatchEnd == len(data) { + // the first match goes to the end of the bufer, so don't look for a second match + return 0, nil, nil + } + + // Flush if no more data is expected + if atEOF && flushAtEOF { + token = trimFunc(data) + advance = len(data) + return + } + + secondLocOfset := firstMatchEnd + 1 + secondLoc := re.FindIndex(data[secondLocOfset:]) + if secondLoc == nil { + return 0, nil, nil // read more data and try again + } + secondMatchStart := secondLoc[0] + secondLocOfset + + advance = secondMatchStart // start scanning at the beginning of the second match + token = trimFunc(data[firstMatchStart:secondMatchStart]) // the token begins at the first match, and ends at the beginning of the second match + err = nil + return + } +} + +// NewLineEndSplitFunc creates a bufio.SplitFunc that splits an incoming stream into +// tokens that end with a match to the regex pattern provided +func NewLineEndSplitFunc(re *regexp.Regexp, flushAtEOF bool, trimFunc trimFunc) bufio.SplitFunc { + return func(data []byte, atEOF bool) (advance int, token []byte, err error) { + loc := re.FindIndex(data) + if loc == nil { + // Flush if no more data is expected + if len(data) != 0 && atEOF && flushAtEOF { + token = trimFunc(data) + advance = len(data) + return + } + return 0, nil, nil // read more data and try again + } + + // If the match goes up to the end of the current bufer, do another + // read until we can capture the entire match + if loc[1] == len(data)-1 && !atEOF { + return 0, nil, nil + } + + advance = loc[1] + token = trimFunc(data[:loc[1]]) + err = nil + return + } +} + +// NewNewlineSplitFunc splits log lines by newline, just as bufio.ScanLines, but +// never returning an token using EOF as a terminator +func NewNewlineSplitFunc(enc encoding.Encoding, flushAtEOF bool, trimFunc trimFunc) (bufio.SplitFunc, error) { + newline, err := encodedNewline(enc) + if err != nil { + return nil, err + } + + carriageReturn, err := encodedCarriageReturn(enc) + if err != nil { + return nil, err + } + + return func(data []byte, atEOF bool) (advance int, token []byte, err error) { + if atEOF && len(data) == 0 { + return 0, nil, nil + } + + if i := bytes.Index(data, newline); i >= 0 { + // We have a full newline-terminated line. + token = bytes.TrimSuffix(data[:i], carriageReturn) + + return i + len(newline), trimFunc(token), nil + } + + // Flush if no more data is expected + if atEOF && flushAtEOF { + token = trimFunc(data) + advance = len(data) + return + } + + // Request more data. + return 0, nil, nil + }, nil +} + +func encodedNewline(enc encoding.Encoding) ([]byte, error) { + out := make([]byte, 10) + nDst, _, err := enc.NewEncoder().Transform(out, []byte{'\n'}, true) + return out[:nDst], err +} + +func encodedCarriageReturn(enc encoding.Encoding) ([]byte, error) { + out := make([]byte, 10) + nDst, _, err := enc.NewEncoder().Transform(out, []byte{'\r'}, true) + return out[:nDst], err +} + +type trimFunc func([]byte) []byte + +func noTrim(token []byte) []byte { + return token +} + +func trimLeadingWhitespacesFunc(data []byte) []byte { + // TrimLeft to strip EOF whitespaces in case of using $ in regex + // For some reason newline and carriage return are being moved to beginning of next log + token := bytes.TrimLeft(data, "\r\n\t ") + if token == nil { + return []byte{} + } + return token +} + +func trimTrailingWhitespacesFunc(data []byte) []byte { + // TrimRight to strip all whitespaces from the end of log + token := bytes.TrimRight(data, "\r\n\t ") + if token == nil { + return []byte{} + } + return token +} + +func trimWhitespacesFunc(data []byte) []byte { + return trimLeadingWhitespacesFunc(trimTrailingWhitespacesFunc(data)) +} + +func getTrimFunc(preserveLeadingWhitespaces, preserveTrailingWhitespaces bool) trimFunc { + if preserveLeadingWhitespaces && preserveTrailingWhitespaces { + return noTrim + } + if preserveLeadingWhitespaces { + return trimTrailingWhitespacesFunc + } + if preserveTrailingWhitespaces { + return trimLeadingWhitespacesFunc + } + return trimWhitespacesFunc +} diff --git a/pkg/stanza/operator/helper/multiline_test.go b/pkg/stanza/tokenize/multiline_test.go similarity index 54% rename from pkg/stanza/operator/helper/multiline_test.go rename to pkg/stanza/tokenize/multiline_test.go index 19abb1eebc0a..23482f25ba9b 100644 --- a/pkg/stanza/operator/helper/multiline_test.go +++ b/pkg/stanza/tokenize/multiline_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package helper +package tokenize import ( "bufio" @@ -12,12 +12,11 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/encoding" "golang.org/x/text/encoding/unicode" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/internal" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize/tokenizetest" ) const ( @@ -27,29 +26,29 @@ const ( ) type MultiLineTokenizerTestCase struct { - internal.TokenizerTestCase + tokenizetest.TestCase Flusher *Flusher } func TestLineStartSplitFunc(t *testing.T) { testCases := []MultiLineTokenizerTestCase{ { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "OneLogSimple", Pattern: `LOGSTART \d+ `, - Raw: []byte("LOGSTART 123 log1LOGSTART 123 a"), - ExpectedTokenized: []string{ + Input: []byte("LOGSTART 123 log1LOGSTART 123 a"), + ExpectedTokens: []string{ `LOGSTART 123 log1`, }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "TwoLogsSimple", Pattern: `LOGSTART \d+ `, - Raw: []byte(`LOGSTART 123 log1 LOGSTART 234 log2 LOGSTART 345 foo`), - ExpectedTokenized: []string{ + Input: []byte(`LOGSTART 123 log1 LOGSTART 234 log2 LOGSTART 345 foo`), + ExpectedTokens: []string{ `LOGSTART 123 log1`, `LOGSTART 234 log2`, }, @@ -57,11 +56,11 @@ func TestLineStartSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "TwoLogsLineStart", Pattern: `^LOGSTART \d+ `, - Raw: []byte("LOGSTART 123 LOGSTART 345 log1\nLOGSTART 234 log2\nLOGSTART 345 foo"), - ExpectedTokenized: []string{ + Input: []byte("LOGSTART 123 LOGSTART 345 log1\nLOGSTART 234 log2\nLOGSTART 345 foo"), + ExpectedTokens: []string{ "LOGSTART 123 LOGSTART 345 log1", "LOGSTART 234 log2", }, @@ -69,19 +68,19 @@ func TestLineStartSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "NoMatches", Pattern: `LOGSTART \d+ `, - Raw: []byte(`file that has no matches in it`), + Input: []byte(`file that has no matches in it`), }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "PrecedingNonMatches", Pattern: `LOGSTART \d+ `, - Raw: []byte(`part that doesn't match LOGSTART 123 part that matchesLOGSTART 123 foo`), - ExpectedTokenized: []string{ + Input: []byte(`part that doesn't match LOGSTART 123 part that matchesLOGSTART 123 foo`), + ExpectedTokens: []string{ `part that doesn't match`, `LOGSTART 123 part that matches`, }, @@ -89,57 +88,57 @@ func TestLineStartSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "HugeLog100", Pattern: `LOGSTART \d+ `, - Raw: func() []byte { - newRaw := []byte(`LOGSTART 123 `) - newRaw = append(newRaw, internal.GeneratedByteSliceOfLength(100)...) - newRaw = append(newRaw, []byte(`LOGSTART 234 endlog`)...) - return newRaw + Input: func() []byte { + newInput := []byte(`LOGSTART 123 `) + newInput = append(newInput, tokenizetest.GenerateBytes(100)...) + newInput = append(newInput, []byte(`LOGSTART 234 endlog`)...) + return newInput }(), - ExpectedTokenized: []string{ - `LOGSTART 123 ` + string(internal.GeneratedByteSliceOfLength(100)), + ExpectedTokens: []string{ + `LOGSTART 123 ` + string(tokenizetest.GenerateBytes(100)), }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "HugeLog10000", Pattern: `LOGSTART \d+ `, - Raw: func() []byte { - newRaw := []byte(`LOGSTART 123 `) - newRaw = append(newRaw, internal.GeneratedByteSliceOfLength(10000)...) - newRaw = append(newRaw, []byte(`LOGSTART 234 endlog`)...) - return newRaw + Input: func() []byte { + newInput := []byte(`LOGSTART 123 `) + newInput = append(newInput, tokenizetest.GenerateBytes(10000)...) + newInput = append(newInput, []byte(`LOGSTART 234 endlog`)...) + return newInput }(), - ExpectedTokenized: []string{ - `LOGSTART 123 ` + string(internal.GeneratedByteSliceOfLength(10000)), + ExpectedTokens: []string{ + `LOGSTART 123 ` + string(tokenizetest.GenerateBytes(10000)), }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "ErrTooLong", Pattern: `LOGSTART \d+ `, - Raw: func() []byte { - newRaw := []byte(`LOGSTART 123 `) - newRaw = append(newRaw, internal.GeneratedByteSliceOfLength(1000000)...) - newRaw = append(newRaw, []byte(`LOGSTART 234 endlog`)...) - return newRaw + Input: func() []byte { + newInput := []byte(`LOGSTART 123 `) + newInput = append(newInput, tokenizetest.GenerateBytes(1000000)...) + newInput = append(newInput, []byte(`LOGSTART 234 endlog`)...) + return newInput }(), ExpectedError: errors.New("bufio.Scanner: token too long"), }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "MultipleMultilineLogs", Pattern: `^LOGSTART \d+`, - Raw: []byte("LOGSTART 12 log1\t \nLOGPART log1\nLOGPART log1\t \nLOGSTART 17 log2\nLOGPART log2\nanother line\nLOGSTART 43 log5"), - ExpectedTokenized: []string{ + Input: []byte("LOGSTART 12 log1\t \nLOGPART log1\nLOGPART log1\t \nLOGSTART 17 log2\nLOGPART log2\nanother line\nLOGSTART 43 log5"), + ExpectedTokens: []string{ "LOGSTART 12 log1\t \nLOGPART log1\nLOGPART log1", "LOGSTART 17 log2\nLOGPART log2\nanother line", }, @@ -147,19 +146,19 @@ func TestLineStartSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithoutFlusher", Pattern: `^LOGSTART \d+`, - Raw: []byte("LOGPART log1\nLOGPART log1\t \n"), + Input: []byte("LOGPART log1\nLOGPART log1\t \n"), }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusher", Pattern: `^LOGSTART \d+`, - Raw: []byte("LOGPART log1\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1\nLOGPART log1", }, @@ -171,11 +170,11 @@ func TestLineStartSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusherWithMultipleLogsInBuffer", Pattern: `^LOGSTART \d+`, - Raw: []byte("LOGPART log1\nLOGSTART 123\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGSTART 123\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1", "LOGSTART 123\nLOGPART log1", }, @@ -187,11 +186,11 @@ func TestLineStartSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithLongFlusherWithMultipleLogsInBuffer", Pattern: `^LOGSTART \d+`, - Raw: []byte("LOGPART log1\nLOGSTART 123\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGSTART 123\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1", }, AdditionalIterations: 1, @@ -202,11 +201,11 @@ func TestLineStartSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusherWithLogStartingWithWhiteChars", Pattern: `^LOGSTART \d+`, - Raw: []byte("\nLOGSTART 333"), - ExpectedTokenized: []string{ + Input: []byte("\nLOGSTART 333"), + ExpectedTokens: []string{ "", "LOGSTART 333", }, @@ -226,7 +225,7 @@ func TestLineStartSplitFunc(t *testing.T) { splitFunc, err := cfg.getSplitFunc(unicode.UTF8, false, tc.Flusher, 0, tc.PreserveLeadingWhitespaces, tc.PreserveTrailingWhitespaces) require.NoError(t, err) - t.Run(tc.Name, tc.RunFunc(splitFunc)) + t.Run(tc.Name, tc.Run(splitFunc)) } t.Run("FirstMatchHitsEndOfBuffer", func(t *testing.T) { @@ -252,22 +251,22 @@ func TestLineStartSplitFunc(t *testing.T) { func TestLineEndSplitFunc(t *testing.T) { testCases := []MultiLineTokenizerTestCase{ { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "OneLogSimple", Pattern: `LOGEND \d+`, - Raw: []byte(`my log LOGEND 123`), - ExpectedTokenized: []string{ + Input: []byte(`my log LOGEND 123`), + ExpectedTokens: []string{ `my log LOGEND 123`, }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "TwoLogsSimple", Pattern: `LOGEND \d+`, - Raw: []byte(`log1 LOGEND 123log2 LOGEND 234`), - ExpectedTokenized: []string{ + Input: []byte(`log1 LOGEND 123log2 LOGEND 234`), + ExpectedTokens: []string{ `log1 LOGEND 123`, `log2 LOGEND 234`, }, @@ -275,11 +274,11 @@ func TestLineEndSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "TwoLogsLineEndSimple", Pattern: `LOGEND$`, - Raw: []byte("log1 LOGEND LOGEND\nlog2 LOGEND\n"), - ExpectedTokenized: []string{ + Input: []byte("log1 LOGEND LOGEND\nlog2 LOGEND\n"), + ExpectedTokens: []string{ "log1 LOGEND LOGEND", "log2 LOGEND", }, @@ -287,73 +286,73 @@ func TestLineEndSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "NoMatches", Pattern: `LOGEND \d+`, - Raw: []byte(`file that has no matches in it`), + Input: []byte(`file that has no matches in it`), }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "NonMatchesAfter", Pattern: `LOGEND \d+`, - Raw: []byte(`part that matches LOGEND 123 part that doesn't match`), - ExpectedTokenized: []string{ + Input: []byte(`part that matches LOGEND 123 part that doesn't match`), + ExpectedTokens: []string{ `part that matches LOGEND 123`, }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "HugeLog100", Pattern: `LOGEND \d`, - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(100) - newRaw = append(newRaw, []byte(`LOGEND 1 `)...) - return newRaw + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(100) + newInput = append(newInput, []byte(`LOGEND 1 `)...) + return newInput }(), - ExpectedTokenized: []string{ - string(internal.GeneratedByteSliceOfLength(100)) + `LOGEND 1`, + ExpectedTokens: []string{ + string(tokenizetest.GenerateBytes(100)) + `LOGEND 1`, }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "HugeLog10000", Pattern: `LOGEND \d`, - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(10000) - newRaw = append(newRaw, []byte(`LOGEND 1 `)...) - return newRaw + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(10000) + newInput = append(newInput, []byte(`LOGEND 1 `)...) + return newInput }(), - ExpectedTokenized: []string{ - string(internal.GeneratedByteSliceOfLength(10000)) + `LOGEND 1`, + ExpectedTokens: []string{ + string(tokenizetest.GenerateBytes(10000)) + `LOGEND 1`, }, }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "HugeLog1000000", Pattern: `LOGEND \d`, - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(1000000) - newRaw = append(newRaw, []byte(`LOGEND 1 `)...) - return newRaw + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(1000000) + newInput = append(newInput, []byte(`LOGEND 1 `)...) + return newInput }(), ExpectedError: errors.New("bufio.Scanner: token too long"), }, nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "MultipleMultilineLogs", Pattern: `^LOGEND.*$`, - Raw: []byte("LOGSTART 12 log1\t \nLOGPART log1\nLOGEND log1\t \nLOGSTART 17 log2\nLOGPART log2\nLOGEND log2\nLOGSTART 43 log5"), - ExpectedTokenized: []string{ + Input: []byte("LOGSTART 12 log1\t \nLOGPART log1\nLOGEND log1\t \nLOGSTART 17 log2\nLOGPART log2\nLOGEND log2\nLOGSTART 43 log5"), + ExpectedTokens: []string{ "LOGSTART 12 log1\t \nLOGPART log1\nLOGEND log1", "LOGSTART 17 log2\nLOGPART log2\nLOGEND log2", }, @@ -361,19 +360,19 @@ func TestLineEndSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithoutFlusher", Pattern: `^LOGEND.*$`, - Raw: []byte("LOGPART log1\nLOGPART log1\t \n"), + Input: []byte("LOGPART log1\nLOGPART log1\t \n"), }, &Flusher{}, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusher", Pattern: `^LOGEND.*$`, - Raw: []byte("LOGPART log1\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1\nLOGPART log1", }, @@ -385,11 +384,11 @@ func TestLineEndSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusherWithMultipleLogsInBuffer", Pattern: `^LOGEND.*$`, - Raw: []byte("LOGPART log1\nLOGEND\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGEND\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1\nLOGEND", "LOGPART log1", }, @@ -402,11 +401,11 @@ func TestLineEndSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithLongFlusherWithMultipleLogsInBuffer", Pattern: `^LOGEND.*$`, - Raw: []byte("LOGPART log1\nLOGEND\nLOGPART log1\t \n"), - ExpectedTokenized: []string{ + Input: []byte("LOGPART log1\nLOGEND\nLOGPART log1\t \n"), + ExpectedTokens: []string{ "LOGPART log1\nLOGEND", }, @@ -418,11 +417,11 @@ func TestLineEndSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{ + tokenizetest.TestCase{ Name: "LogsWithFlusherWithLogStartingWithWhiteChars", Pattern: `LOGEND \d+$`, - Raw: []byte("\nLOGEND 333"), - ExpectedTokenized: []string{ + Input: []byte("\nLOGEND 333"), + ExpectedTokens: []string{ "LOGEND 333", }, @@ -442,33 +441,33 @@ func TestLineEndSplitFunc(t *testing.T) { splitFunc, err := cfg.getSplitFunc(unicode.UTF8, false, tc.Flusher, 0, tc.PreserveLeadingWhitespaces, tc.PreserveTrailingWhitespaces) require.NoError(t, err) - t.Run(tc.Name, tc.RunFunc(splitFunc)) + t.Run(tc.Name, tc.Run(splitFunc)) } } func TestNewlineSplitFunc(t *testing.T) { testCases := []MultiLineTokenizerTestCase{ { - internal.TokenizerTestCase{Name: "OneLogSimple", - Raw: []byte("my log\n"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "OneLogSimple", + Input: []byte("my log\n"), + ExpectedTokens: []string{ `my log`, }, }, nil, }, { - internal.TokenizerTestCase{Name: "OneLogCarriageReturn", - Raw: []byte("my log\r\n"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "OneLogCarriageReturn", + Input: []byte("my log\r\n"), + ExpectedTokens: []string{ `my log`, }, }, nil, }, { - internal.TokenizerTestCase{Name: "TwoLogsSimple", - Raw: []byte("log1\nlog2\n"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "TwoLogsSimple", + Input: []byte("log1\nlog2\n"), + ExpectedTokens: []string{ `log1`, `log2`, }, @@ -476,9 +475,9 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "TwoLogsCarriageReturn", - Raw: []byte("log1\r\nlog2\r\n"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "TwoLogsCarriageReturn", + Input: []byte("log1\r\nlog2\r\n"), + ExpectedTokens: []string{ `log1`, `log2`, }, @@ -486,59 +485,59 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "NoTailingNewline", - Raw: []byte(`foo`), + tokenizetest.TestCase{Name: "NoTailingNewline", + Input: []byte(`foo`), }, nil, }, { - internal.TokenizerTestCase{Name: "HugeLog100", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(100) - newRaw = append(newRaw, '\n') - return newRaw + tokenizetest.TestCase{Name: "HugeLog100", + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(100) + newInput = append(newInput, '\n') + return newInput }(), - ExpectedTokenized: []string{ - string(internal.GeneratedByteSliceOfLength(100)), + ExpectedTokens: []string{ + string(tokenizetest.GenerateBytes(100)), }, }, nil, }, { - internal.TokenizerTestCase{Name: "HugeLog10000", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(10000) - newRaw = append(newRaw, '\n') - return newRaw + tokenizetest.TestCase{Name: "HugeLog10000", + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(10000) + newInput = append(newInput, '\n') + return newInput }(), - ExpectedTokenized: []string{ - string(internal.GeneratedByteSliceOfLength(10000)), + ExpectedTokens: []string{ + string(tokenizetest.GenerateBytes(10000)), }, }, nil, }, { - internal.TokenizerTestCase{Name: "HugeLog1000000", - Raw: func() []byte { - newRaw := internal.GeneratedByteSliceOfLength(1000000) - newRaw = append(newRaw, '\n') - return newRaw + tokenizetest.TestCase{Name: "HugeLog1000000", + Input: func() []byte { + newInput := tokenizetest.GenerateBytes(1000000) + newInput = append(newInput, '\n') + return newInput }(), ExpectedError: errors.New("bufio.Scanner: token too long"), }, nil, }, { - internal.TokenizerTestCase{Name: "LogsWithoutFlusher", - Raw: []byte("LOGPART log1"), + tokenizetest.TestCase{Name: "LogsWithoutFlusher", + Input: []byte("LOGPART log1"), }, &Flusher{}, }, { - internal.TokenizerTestCase{Name: "LogsWithFlusher", - Raw: []byte("LOGPART log1"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "LogsWithFlusher", + Input: []byte("LOGPART log1"), + ExpectedTokens: []string{ "LOGPART log1", }, AdditionalIterations: 1, @@ -549,9 +548,9 @@ func TestNewlineSplitFunc(t *testing.T) { }, }, { - internal.TokenizerTestCase{Name: "DefaultFlusherSplits", - Raw: []byte("log1\nlog2\n"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "DefaultFlusherSplits", + Input: []byte("log1\nlog2\n"), + ExpectedTokens: []string{ "log1", "log2", }, @@ -559,9 +558,9 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "LogsWithLogStartingWithWhiteChars", - Raw: []byte("\nLOGEND 333\nAnother one"), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "LogsWithLogStartingWithWhiteChars", + Input: []byte("\nLOGEND 333\nAnother one"), + ExpectedTokens: []string{ "", "LOGEND 333", }, @@ -569,9 +568,9 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "PreserveLeadingWhitespaces", - Raw: []byte("\n LOGEND 333 \nAnother one "), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "PreserveLeadingWhitespaces", + Input: []byte("\n LOGEND 333 \nAnother one "), + ExpectedTokens: []string{ "", " LOGEND 333", }, @@ -580,9 +579,9 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "PreserveTrailingWhitespaces", - Raw: []byte("\n LOGEND 333 \nAnother one "), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "PreserveTrailingWhitespaces", + Input: []byte("\n LOGEND 333 \nAnother one "), + ExpectedTokens: []string{ "", "LOGEND 333 ", }, @@ -591,9 +590,9 @@ func TestNewlineSplitFunc(t *testing.T) { nil, }, { - internal.TokenizerTestCase{Name: "PreserveBothLeadingAndTrailingWhitespaces", - Raw: []byte("\n LOGEND 333 \nAnother one "), - ExpectedTokenized: []string{ + tokenizetest.TestCase{Name: "PreserveBothLeadingAndTrailingWhitespaces", + Input: []byte("\n LOGEND 333 \nAnother one "), + ExpectedTokens: []string{ "", " LOGEND 333 ", }, @@ -610,99 +609,68 @@ func TestNewlineSplitFunc(t *testing.T) { if tc.Flusher != nil { splitFunc = tc.Flusher.SplitFunc(splitFunc) } - t.Run(tc.Name, tc.RunFunc(splitFunc)) - } -} - -type noSplitTestCase struct { - Name string - Raw []byte - ExpectedTokenized [][]byte -} - -func (tc noSplitTestCase) RunFunc(splitFunc bufio.SplitFunc) func(t *testing.T) { - return func(t *testing.T) { - scanner := bufio.NewScanner(bytes.NewReader(tc.Raw)) - scanner.Split(splitFunc) - var tokenized [][]byte - for { - ok := scanner.Scan() - if !ok { - break - } - tokenized = append(tokenized, scanner.Bytes()) - } - - assert.Equal(t, tc.ExpectedTokenized, tokenized) + t.Run(tc.Name, tc.Run(splitFunc)) } } func TestNoSplitFunc(t *testing.T) { const largeLogSize = 100 - testCases := []noSplitTestCase{ + testCases := []tokenizetest.TestCase{ { - Name: "OneLogSimple", - Raw: []byte("my log\n"), - ExpectedTokenized: [][]byte{ - []byte("my log\n"), - }, + Name: "OneLogSimple", + Input: []byte("my log\n"), + ExpectedTokens: []string{"my log\n"}, }, { - Name: "TwoLogsSimple", - Raw: []byte("log1\nlog2\n"), - ExpectedTokenized: [][]byte{ - []byte("log1\nlog2\n"), - }, + Name: "TwoLogsSimple", + Input: []byte("log1\nlog2\n"), + ExpectedTokens: []string{"log1\nlog2\n"}, }, { - Name: "TwoLogsCarriageReturn", - Raw: []byte("log1\r\nlog2\r\n"), - ExpectedTokenized: [][]byte{ - []byte("log1\r\nlog2\r\n"), - }, + Name: "TwoLogsCarriageReturn", + Input: []byte("log1\r\nlog2\r\n"), + ExpectedTokens: []string{"log1\r\nlog2\r\n"}, }, { - Name: "NoTailingNewline", - Raw: []byte(`foo`), - ExpectedTokenized: [][]byte{[]byte("foo")}, + Name: "NoTailingNewline", + Input: []byte(`foo`), + ExpectedTokens: []string{"foo"}, }, { Name: "HugeLog100", - Raw: func() []byte { - return internal.GeneratedByteSliceOfLength(largeLogSize) + Input: func() []byte { + return tokenizetest.GenerateBytes(largeLogSize) }(), - ExpectedTokenized: [][]byte{ - internal.GeneratedByteSliceOfLength(100), - }, + ExpectedTokens: []string{string(tokenizetest.GenerateBytes(largeLogSize))}, }, { Name: "HugeLog300", - Raw: func() []byte { - return internal.GeneratedByteSliceOfLength(largeLogSize * 3) + Input: func() []byte { + return tokenizetest.GenerateBytes(largeLogSize * 3) }(), - ExpectedTokenized: [][]byte{ - []byte("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv"), - []byte("wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr"), - []byte("stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn"), + ExpectedTokens: []string{ + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv", + "wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr", + "stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn", }, }, { Name: "EOFBeforeMaxLogSize", - Raw: func() []byte { - return internal.GeneratedByteSliceOfLength(largeLogSize * 3.5) + Input: func() []byte { + return tokenizetest.GenerateBytes(largeLogSize * 3.5) }(), - ExpectedTokenized: [][]byte{ - []byte("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv"), - []byte("wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr"), - []byte("stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn"), - []byte("opqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl"), + ExpectedTokens: []string{ + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv", + "wxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqr", + "stuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmn", + "opqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl", }, }, } for _, tc := range testCases { splitFunc := SplitNone(largeLogSize) - t.Run(tc.Name, tc.RunFunc(splitFunc)) + t.Run(tc.Name, tc.Run(splitFunc)) } } diff --git a/pkg/stanza/tokenize/splitter.go b/pkg/stanza/tokenize/splitter.go new file mode 100644 index 000000000000..8f58402e5389 --- /dev/null +++ b/pkg/stanza/tokenize/splitter.go @@ -0,0 +1,73 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package tokenize // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" + +import ( + "bufio" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decoder" +) + +// SplitterConfig consolidates MultilineConfig and FlusherConfig +type SplitterConfig struct { + Encoding string `mapstructure:"encoding,omitempty"` + Flusher FlusherConfig `mapstructure:",squash,omitempty"` + Multiline MultilineConfig `mapstructure:"multiline,omitempty"` + PreserveLeadingWhitespaces bool `mapstructure:"preserve_leading_whitespaces,omitempty"` + PreserveTrailingWhitespaces bool `mapstructure:"preserve_trailing_whitespaces,omitempty"` +} + +// NewSplitterConfig returns default SplitterConfig +func NewSplitterConfig() SplitterConfig { + return SplitterConfig{ + Encoding: "utf-8", + Multiline: NewMultilineConfig(), + Flusher: NewFlusherConfig(), + } +} + +// Build builds Splitter struct +func (c *SplitterConfig) Build(flushAtEOF bool, maxLogSize int) (*Splitter, error) { + enc, err := decoder.LookupEncoding(c.Encoding) + if err != nil { + return nil, err + } + + flusher := c.Flusher.Build() + splitFunc, err := c.Multiline.Build(enc, flushAtEOF, c.PreserveLeadingWhitespaces, c.PreserveTrailingWhitespaces, flusher, maxLogSize) + if err != nil { + return nil, err + } + + return &Splitter{ + Decoder: decoder.New(enc), + Flusher: flusher, + SplitFunc: splitFunc, + }, nil +} + +// Splitter consolidates Flusher and dependent splitFunc +type Splitter struct { + Decoder *decoder.Decoder + SplitFunc bufio.SplitFunc + Flusher *Flusher +} + +// SplitNone doesn't split any of the bytes, it reads in all of the bytes and returns it all at once. This is for when the encoding is nop +func SplitNone(maxLogSize int) bufio.SplitFunc { + return func(data []byte, atEOF bool) (advance int, token []byte, err error) { + if len(data) >= maxLogSize { + return maxLogSize, data[:maxLogSize], nil + } + + if !atEOF { + return 0, nil, nil + } + + if len(data) == 0 { + return 0, nil, nil + } + return len(data), data, nil + } +} diff --git a/pkg/stanza/operator/internal/test_common.go b/pkg/stanza/tokenize/tokenizetest/tokenize.go similarity index 59% rename from pkg/stanza/operator/internal/test_common.go rename to pkg/stanza/tokenize/tokenizetest/tokenize.go index 39210f43aef7..996ced63ef50 100644 --- a/pkg/stanza/operator/internal/test_common.go +++ b/pkg/stanza/tokenize/tokenizetest/tokenize.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package internal // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/internal" +package tokenizetest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize/tokenizetest" import ( "bufio" @@ -12,21 +12,21 @@ import ( "github.com/stretchr/testify/assert" ) -// state is going to keep processing state of the TestReader +// state is going to keep processing state of the testReader type state struct { ReadFrom int Processed int } -// TestReader is a TestReader which keeps state of readed and processed data -type TestReader struct { +// testReader is a testReader which keeps state of readed and processed data +type testReader struct { State *state Data []byte } -// NewTestReader creates TestReader with empty state -func NewTestReader(data []byte) TestReader { - return TestReader{ +// newTestReader creates testReader with empty state +func newTestReader(data []byte) testReader { + return testReader{ State: &state{ ReadFrom: 0, Processed: 0, @@ -35,8 +35,8 @@ func NewTestReader(data []byte) TestReader { } } -// Read reads data from TestReader and remebers where reading has been finished -func (r TestReader) Read(p []byte) (n int, err error) { +// Read reads data from testReader and remebers where reading has been finished +func (r testReader) Read(p []byte) (n int, err error) { // return eof if data has been fully readed if len(r.Data)-r.State.ReadFrom == 0 { return 0, io.EOF @@ -57,24 +57,24 @@ func (r TestReader) Read(p []byte) (n int, err error) { return i, nil } -// Reset resets TestReader state (sets last readed position to last processed position) -func (r *TestReader) Reset() { +// Reset resets testReader state (sets last readed position to last processed position) +func (r *testReader) Reset() { r.State.ReadFrom = r.State.Processed } -func (r *TestReader) SplitFunc(splitFunc bufio.SplitFunc) bufio.SplitFunc { +func (r *testReader) splitFunc(split bufio.SplitFunc) bufio.SplitFunc { return func(data []byte, atEOF bool) (advance int, token []byte, err error) { - advance, token, err = splitFunc(data, atEOF) + advance, token, err = split(data, atEOF) r.State.Processed += advance return } } -type TokenizerTestCase struct { +type TestCase struct { Name string Pattern string - Raw []byte - ExpectedTokenized []string + Input []byte + ExpectedTokens []string ExpectedError error Sleep time.Duration AdditionalIterations int @@ -82,11 +82,11 @@ type TokenizerTestCase struct { PreserveTrailingWhitespaces bool } -func (tc TokenizerTestCase) RunFunc(splitFunc bufio.SplitFunc) func(t *testing.T) { - reader := NewTestReader(tc.Raw) +func (tc TestCase) Run(split bufio.SplitFunc) func(t *testing.T) { + reader := newTestReader(tc.Input) return func(t *testing.T) { - var tokenized []string + var tokens []string for i := 0; i < 1+tc.AdditionalIterations; i++ { // sleep before next iterations if i > 0 { @@ -94,22 +94,22 @@ func (tc TokenizerTestCase) RunFunc(splitFunc bufio.SplitFunc) func(t *testing.T } reader.Reset() scanner := bufio.NewScanner(reader) - scanner.Split(reader.SplitFunc(splitFunc)) + scanner.Split(reader.splitFunc(split)) for { ok := scanner.Scan() if !ok { assert.Equal(t, tc.ExpectedError, scanner.Err()) break } - tokenized = append(tokenized, scanner.Text()) + tokens = append(tokens, scanner.Text()) } } - assert.Equal(t, tc.ExpectedTokenized, tokenized) + assert.Equal(t, tc.ExpectedTokens, tokens) } } -func GeneratedByteSliceOfLength(length int) []byte { +func GenerateBytes(length int) []byte { chars := []byte(`abcdefghijklmnopqrstuvwxyz`) newSlice := make([]byte, length) for i := 0; i < length; i++ { diff --git a/pkg/translator/loki/encode.go b/pkg/translator/loki/encode.go index c6d208a87c9c..591c78ed4a0e 100644 --- a/pkg/translator/loki/encode.go +++ b/pkg/translator/loki/encode.go @@ -30,8 +30,9 @@ type lokiEntry struct { } type instrumentationScope struct { - Name string `json:"name,omitempty"` - Version string `json:"version,omitempty"` + Name string `json:"name,omitempty"` + Version string `json:"version,omitempty"` + Attributes map[string]interface{} `json:"attributes,omitempty"` } // Encode converts an OTLP log record and its resource attributes into a JSON @@ -58,14 +59,12 @@ func Encode(lr plog.LogRecord, res pcommon.Resource, scope pcommon.Instrumentati } scopeName := scope.Name() - scopeVersion := scope.Version() if scopeName != "" { logRecord.InstrumentationScope = &instrumentationScope{ Name: scopeName, } - if scopeVersion != "" { - logRecord.InstrumentationScope.Version = scopeVersion - } + logRecord.InstrumentationScope.Version = scope.Version() + logRecord.InstrumentationScope.Attributes = scope.Attributes().AsRaw() } jsonRecord, err = json.Marshal(logRecord) @@ -112,11 +111,16 @@ func EncodeLogfmt(lr plog.LogRecord, res pcommon.Resource, scope pcommon.Instrum scopeName := scope.Name() scopeVersion := scope.Version() + if scopeName != "" { keyvals = append(keyvals, "instrumentation_scope_name", scopeName) if scopeVersion != "" { keyvals = append(keyvals, "instrumentation_scope_version", scopeVersion) } + scope.Attributes().Range(func(k string, v pcommon.Value) bool { + keyvals = append(keyvals, valueToKeyvals(fmt.Sprintf("instrumentation_scope_attribute_%s", k), v)...) + return true + }) } logfmtLine, err := logfmt.MarshalKeyvals(keyvals...) diff --git a/pkg/translator/loki/encode_test.go b/pkg/translator/loki/encode_test.go index d489c939eaa7..6b07e6b6c13d 100644 --- a/pkg/translator/loki/encode_test.go +++ b/pkg/translator/loki/encode_test.go @@ -55,6 +55,16 @@ func TestEncodeJsonWithMapBody(t *testing.T) { assert.Equal(t, in, out) } +func TestEncodeJsonWithInstrumentationScopeAttributes(t *testing.T) { + in := `{"body":"Example log","traceid":"01020304000000000000000000000000","spanid":"0506070800000000","severity":"error","attributes":{"attr1":"1","attr2":"2"},"resources":{"host.name":"something"},"instrumentation_scope":{"name":"example-logger-name","version":"v1","attributes":{"foo":"bar"}}}` + log, resource, scope := exampleLog() + scope.Attributes().PutStr("foo", "bar") + + out, err := Encode(log, resource, scope) + assert.NoError(t, err) + assert.Equal(t, in, out) +} + func TestSerializeComplexBody(t *testing.T) { arrayval := pcommon.NewValueSlice() @@ -215,3 +225,13 @@ func TestEncodeLogfmtWithFlags(t *testing.T) { assert.NoError(t, err) assert.Equal(t, in, out) } + +func TestEncodeLogfmtWithInstrumentationScopeAttributes(t *testing.T) { + in := `msg="hello world" traceID=01020304000000000000000000000000 spanID=0506070800000000 severity=error attribute_attr1=1 attribute_attr2=2 resource_host.name=something instrumentation_scope_name=example-logger-name instrumentation_scope_version=v1 instrumentation_scope_attribute_foo=bar` + log, resource, scope := exampleLog() + scope.Attributes().PutStr("foo", "bar") + log.Body().SetStr("msg=\"hello world\"") + out, err := EncodeLogfmt(log, resource, scope) + assert.NoError(t, err) + assert.Equal(t, in, out) +} diff --git a/pkg/translator/loki/logs_to_loki.go b/pkg/translator/loki/logs_to_loki.go index 9b90a26b426b..9a5ddc11b071 100644 --- a/pkg/translator/loki/logs_to_loki.go +++ b/pkg/translator/loki/logs_to_loki.go @@ -80,16 +80,8 @@ func LogsToLokiRequests(ld plog.Logs, defaultLabelsEnabled map[string]bool) map[ group.report.NumSubmitted++ - processed := model.LabelSet{} - for label := range entry.Labels { - // Loki doesn't support dots in label names - // labelName is normalized label name to follow Prometheus label names standard - labelName := prometheustranslator.NormalizeLabel(string(label)) - processed[model.LabelName(labelName)] = entry.Labels[label] - } - // create the stream name based on the labels - labels := processed.String() + labels := entry.Labels.String() if stream, ok := group.streams[labels]; ok { stream.Entries = append(stream.Entries, *entry.Entry) continue @@ -128,7 +120,7 @@ type PushEntry struct { Labels model.LabelSet } -// LogToLokiEntry converts LogRecord into Loki log entry enriched with labels and tenant +// LogToLokiEntry converts LogRecord into Loki log entry enriched with normalized labels func LogToLokiEntry(lr plog.LogRecord, rl pcommon.Resource, scope pcommon.InstrumentationScope, defaultLabelsEnabled map[string]bool) (*PushEntry, error) { // we may remove attributes, so change only our version log := plog.NewLogRecord() @@ -155,9 +147,17 @@ func LogToLokiEntry(lr plog.LogRecord, rl pcommon.Resource, scope pcommon.Instru return nil, err } + labels := model.LabelSet{} + for label := range mergedLabels { + // Loki doesn't support dots in label names + // labelName is normalized label name to follow Prometheus label names standard + labelName := prometheustranslator.NormalizeLabel(string(label)) + labels[model.LabelName(labelName)] = mergedLabels[label] + } + return &PushEntry{ Entry: entry, - Labels: mergedLabels, + Labels: labels, }, nil } diff --git a/pkg/translator/loki/logs_to_loki_test.go b/pkg/translator/loki/logs_to_loki_test.go index 6f380b3dd6eb..871f909c07d2 100644 --- a/pkg/translator/loki/logs_to_loki_test.go +++ b/pkg/translator/loki/logs_to_loki_test.go @@ -521,7 +521,7 @@ func TestLogToLokiEntry(t *testing.T) { }, Labels: model.LabelSet{ "exporter": "OTLP", - "host.name": "guarana", + "host_name": "guarana", }, }, err: nil, @@ -543,7 +543,7 @@ func TestLogToLokiEntry(t *testing.T) { }, Labels: model.LabelSet{ "exporter": "OTLP", - "host.name": "guarana", + "host_name": "guarana", }, }, }, @@ -565,7 +565,7 @@ func TestLogToLokiEntry(t *testing.T) { }, Labels: model.LabelSet{ "exporter": "OTLP", - "host.name": "guarana", + "host_name": "guarana", }, }, }, @@ -617,6 +617,26 @@ func TestLogToLokiEntry(t *testing.T) { }, }, }, + { + name: "with instrumentation scope attributes", + timestamp: time.Unix(0, 1677592916000000000), + instrumentationScope: &instrumentationScope{ + Name: "otlp", + Version: "v1", + Attributes: map[string]interface{}{ + "foo": "bar", + }, + }, + expected: &PushEntry{ + Entry: &push.Entry{ + Timestamp: time.Unix(0, 1677592916000000000), + Line: `{"instrumentation_scope":{"name":"otlp","version":"v1","attributes":{"foo":"bar"}}}`, + }, + Labels: model.LabelSet{ + "exporter": "OTLP", + }, + }, + }, { name: "with unknown format hint", timestamp: time.Unix(0, 1677592916000000000), @@ -650,6 +670,8 @@ func TestLogToLokiEntry(t *testing.T) { if tt.instrumentationScope != nil { scope.SetName(tt.instrumentationScope.Name) scope.SetVersion(tt.instrumentationScope.Version) + err = scope.Attributes().FromRaw(tt.instrumentationScope.Attributes) + require.NoError(t, err) } resource := pcommon.NewResource() diff --git a/pkg/translator/prometheus/README.md b/pkg/translator/prometheus/README.md index 7c29facac63c..3f50583c5247 100644 --- a/pkg/translator/prometheus/README.md +++ b/pkg/translator/prometheus/README.md @@ -29,7 +29,6 @@ | Percentages (unit is `1`) | Append `_ratio` (for gauges only) | `system.memory.utilization` with unit `1` → `system_memory_utilization_ratio` | | Percentages (unit is `%`) | Replace `%` with `percent` `_percent` | `storage.filesystem.utilization` with unit `%` → `storage_filesystem_utilization_percent` | | Rates (unit contains `/`) | Replace `/` with `per` | `astro.light.speed` with unit `m/s` → `astro_light_speed_meters_per_second` | -| Dollars (unit is `$`) | Replace `$` with `dollars` | `crypto.dogecoin.value` with unit `$` → `crypto_dogecoin_value_dollars` | | Counter | Append `_total` | `system.processes.created` → `system_processes_created_total` | List of standard OpenTelemetry units that will be translated to [Prometheus standard base units](https://prometheus.io/docs/practices/naming/#base-units): @@ -54,11 +53,6 @@ List of standard OpenTelemetry units that will be translated to [Prometheus stan | `MBy` | `megabytes` | | `GBy` | `gigabytes` | | `TBy` | `terabytes` | -| `B` | `bytes` | -| `KB` | `kilobytes` | -| `MB` | `megabytes` | -| `GB` | `gigabytes` | -| `TB` | `terabytes` | | **SI Units** | | | `m` | `meters` | | `V` | `volts` | @@ -70,7 +64,6 @@ List of standard OpenTelemetry units that will be translated to [Prometheus stan | `Cel` | `celsius` | | `Hz` | `hertz` | | `%` | `percent` | -| `$` | `dollars` | > **Note** > Prometheus also recommends using base units (no kilobytes, or milliseconds, for example) but these functions will not attempt to convert non-base units to base units. diff --git a/pkg/translator/prometheus/normalize_name.go b/pkg/translator/prometheus/normalize_name.go index 3b1647aabc8c..ec874064556f 100644 --- a/pkg/translator/prometheus/normalize_name.go +++ b/pkg/translator/prometheus/normalize_name.go @@ -72,11 +72,6 @@ var normalizeNameGate = featuregate.GlobalRegistry().MustRegister( featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/8950"), ) -// Deprecated: use BuildCompliantName instead. -func BuildPromCompliantName(metric pmetric.Metric, namespace string) string { - return BuildCompliantName(metric, namespace, true) -} - // BuildCompliantName builds a Prometheus-compliant metric name for the specified metric // // Metric name is prefixed with specified namespace and underscore (if any). diff --git a/pkg/translator/prometheus/unit_to_ucum.go b/pkg/translator/prometheus/unit_to_ucum.go new file mode 100644 index 000000000000..b2f2c4f3aa2f --- /dev/null +++ b/pkg/translator/prometheus/unit_to_ucum.go @@ -0,0 +1,90 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package prometheus // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus" + +import "strings" + +var wordToUCUM = map[string]string{ + + // Time + "days": "d", + "hours": "h", + "minutes": "min", + "seconds": "s", + "milliseconds": "ms", + "microseconds": "us", + "nanoseconds": "ns", + + // Bytes + "bytes": "By", + "kibibytes": "KiBy", + "mebibytes": "MiBy", + "gibibytes": "GiBy", + "tibibytes": "TiBy", + "kilobytes": "KBy", + "megabytes": "MBy", + "gigabytes": "GBy", + "terabytes": "TBy", + + // SI + "meters": "m", + "volts": "V", + "amperes": "A", + "joules": "J", + "watts": "W", + "grams": "g", + + // Misc + "celsius": "Cel", + "hertz": "Hz", + "ratio": "1", + "percent": "%", +} + +// The map that translates the "per" unit +// Example: per_second (singular) => /s +var perWordToUCUM = map[string]string{ + "second": "s", + "minute": "m", + "hour": "h", + "day": "d", + "week": "w", + "month": "mo", + "year": "y", +} + +// UnitWordToUCUM converts english unit words to UCUM units: +// https://ucum.org/ucum#section-Alphabetic-Index-By-Symbol +// It also handles rates, such as meters_per_second, by translating the first +// word to UCUM, and the "per" word to UCUM. It joins them with a "/" between. +func UnitWordToUCUM(unit string) string { + unitTokens := strings.SplitN(unit, "_per_", 2) + if len(unitTokens) == 0 { + return "" + } + ucumUnit := wordToUCUMOrDefault(unitTokens[0]) + if len(unitTokens) > 1 && unitTokens[1] != "" { + ucumUnit += "/" + perWordToUCUMOrDefault(unitTokens[1]) + } + return ucumUnit +} + +// wordToUCUMOrDefault retrieves the Prometheus "basic" unit corresponding to +// the specified "basic" unit. Returns the specified unit if not found in +// wordToUCUM. +func wordToUCUMOrDefault(unit string) string { + if promUnit, ok := wordToUCUM[unit]; ok { + return promUnit + } + return unit +} + +// perWordToUCUMOrDefault retrieve the Prometheus "per" unit corresponding to +// the specified "per" unit. Returns the specified unit if not found in perWordToUCUM. +func perWordToUCUMOrDefault(perUnit string) string { + if promPerUnit, ok := perWordToUCUM[perUnit]; ok { + return promPerUnit + } + return perUnit +} diff --git a/pkg/translator/prometheus/unit_to_ucum_test.go b/pkg/translator/prometheus/unit_to_ucum_test.go new file mode 100644 index 000000000000..518a2983a2fa --- /dev/null +++ b/pkg/translator/prometheus/unit_to_ucum_test.go @@ -0,0 +1,61 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package prometheus // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus" + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestUnitWordToUCUM(t *testing.T) { + for _, tc := range []struct { + input string + expected string + }{ + { + input: "", + expected: "", + }, + { + input: "days", + expected: "d", + }, + { + input: "seconds", + expected: "s", + }, + { + input: "kibibytes", + expected: "KiBy", + }, + { + input: "volts", + expected: "V", + }, + { + input: "bananas_per_day", + expected: "bananas/d", + }, + { + input: "meters_per_hour", + expected: "m/h", + }, + { + input: "ratio", + expected: "1", + }, + { + input: "percent", + expected: "%", + }, + } { + t.Run(fmt.Sprintf("input: \"%v\"", tc.input), func(t *testing.T) { + got := UnitWordToUCUM(tc.input) + assert.Equal(t, tc.expected, got) + }) + } + +} diff --git a/pkg/translator/prometheusremotewrite/helper.go b/pkg/translator/prometheusremotewrite/helper.go index 058f72a1c8d3..55a3b6d55cf4 100644 --- a/pkg/translator/prometheusremotewrite/helper.go +++ b/pkg/translator/prometheusremotewrite/helper.go @@ -239,6 +239,7 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, externa // isValidAggregationTemporality checks whether an OTel metric has a valid // aggregation temporality for conversion to a Prometheus metric. func isValidAggregationTemporality(metric pmetric.Metric) bool { + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge, pmetric.MetricTypeSummary: return true @@ -414,6 +415,7 @@ func getPromExemplars[T exemplarType](pt T) []prompb.Exemplar { func mostRecentTimestampInMetric(metric pmetric.Metric) pcommon.Timestamp { var ts pcommon.Timestamp // handle individual metric based on type + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: dataPoints := metric.Gauge().DataPoints() diff --git a/pkg/translator/prometheusremotewrite/metrics_to_prw.go b/pkg/translator/prometheusremotewrite/metrics_to_prw.go index 14780dc186fb..2889a4e9640a 100644 --- a/pkg/translator/prometheusremotewrite/metrics_to_prw.go +++ b/pkg/translator/prometheusremotewrite/metrics_to_prw.go @@ -50,6 +50,7 @@ func FromMetrics(md pmetric.Metrics, settings Settings) (tsMap map[string]*promp } // handle individual metric based on type + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: dataPoints := metric.Gauge().DataPoints() diff --git a/pkg/translator/signalfx/from_metrics.go b/pkg/translator/signalfx/from_metrics.go index c0b7714e8533..8c0c7f89edaa 100644 --- a/pkg/translator/signalfx/from_metrics.go +++ b/pkg/translator/signalfx/from_metrics.go @@ -36,7 +36,7 @@ const ( type FromTranslator struct{} // FromMetrics converts pmetric.Metrics to SignalFx proto data points. -func (ft *FromTranslator) FromMetrics(md pmetric.Metrics) ([]*sfxpb.DataPoint, error) { +func (ft *FromTranslator) FromMetrics(md pmetric.Metrics, dropHistogramBuckets bool) ([]*sfxpb.DataPoint, error) { var sfxDataPoints []*sfxpb.DataPoint rms := md.ResourceMetrics() @@ -47,7 +47,7 @@ func (ft *FromTranslator) FromMetrics(md pmetric.Metrics) ([]*sfxpb.DataPoint, e for j := 0; j < rm.ScopeMetrics().Len(); j++ { ilm := rm.ScopeMetrics().At(j) for k := 0; k < ilm.Metrics().Len(); k++ { - sfxDataPoints = append(sfxDataPoints, ft.FromMetric(ilm.Metrics().At(k), extraDimensions)...) + sfxDataPoints = append(sfxDataPoints, ft.FromMetric(ilm.Metrics().At(k), extraDimensions, dropHistogramBuckets)...) } } } @@ -57,7 +57,7 @@ func (ft *FromTranslator) FromMetrics(md pmetric.Metrics) ([]*sfxpb.DataPoint, e // FromMetric converts pmetric.Metric to SignalFx proto data points. // TODO: Remove this and change signalfxexporter to us FromMetrics. -func (ft *FromTranslator) FromMetric(m pmetric.Metric, extraDimensions []*sfxpb.Dimension) []*sfxpb.DataPoint { +func (ft *FromTranslator) FromMetric(m pmetric.Metric, extraDimensions []*sfxpb.Dimension, dropHistogramBuckets bool) []*sfxpb.DataPoint { var dps []*sfxpb.DataPoint mt := fromMetricTypeToMetricType(m) @@ -68,7 +68,7 @@ func (ft *FromTranslator) FromMetric(m pmetric.Metric, extraDimensions []*sfxpb. case pmetric.MetricTypeSum: dps = convertNumberDataPoints(m.Sum().DataPoints(), m.Name(), mt, extraDimensions) case pmetric.MetricTypeHistogram: - dps = convertHistogram(m.Histogram().DataPoints(), m.Name(), mt, extraDimensions) + dps = convertHistogram(m.Histogram().DataPoints(), m.Name(), mt, extraDimensions, dropHistogramBuckets) case pmetric.MetricTypeSummary: dps = convertSummaryDataPoints(m.Summary().DataPoints(), m.Name(), extraDimensions) case pmetric.MetricTypeExponentialHistogram: @@ -131,7 +131,7 @@ func convertNumberDataPoints(in pmetric.NumberDataPointSlice, name string, mt *s return dps.out } -func convertHistogram(in pmetric.HistogramDataPointSlice, name string, mt *sfxpb.MetricType, extraDims []*sfxpb.Dimension) []*sfxpb.DataPoint { +func convertHistogram(in pmetric.HistogramDataPointSlice, name string, mt *sfxpb.MetricType, extraDims []*sfxpb.Dimension, dropHistogramBuckets bool) []*sfxpb.DataPoint { var numDPs int for i := 0; i < in.Len(); i++ { histDP := in.At(i) @@ -179,6 +179,11 @@ func convertHistogram(in pmetric.HistogramDataPointSlice, name string, mt *sfxpb maxDP.Value.DoubleValue = &max } + // Drop Histogram Buckets if flag is set. + if dropHistogramBuckets { + continue + } + bounds := histDP.ExplicitBounds() counts := histDP.BucketCounts() diff --git a/pkg/translator/signalfx/from_metrics_test.go b/pkg/translator/signalfx/from_metrics_test.go index f85bb08ce2cc..5f3b0997989b 100644 --- a/pkg/translator/signalfx/from_metrics_test.go +++ b/pkg/translator/signalfx/from_metrics_test.go @@ -384,7 +384,96 @@ func Test_FromMetrics(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { from := &FromTranslator{} - gotSfxDataPoints, err := from.FromMetrics(tt.metricsFn()) + gotSfxDataPoints, err := from.FromMetrics(tt.metricsFn(), false) + require.NoError(t, err) + // Sort SFx dimensions since they are built from maps and the order + // of those is not deterministic. + sortDimensions(tt.wantSfxDataPoints) + sortDimensions(gotSfxDataPoints) + assert.EqualValues(t, tt.wantSfxDataPoints, gotSfxDataPoints) + }) + } + + testsWithDropHistogramBuckets := []struct { + name string + metricsFn func() pmetric.Metrics + wantSfxDataPoints []*sfxpb.DataPoint + }{ + { + name: "histogram", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + m := ilm.Metrics().AppendEmpty() + m.SetName("histogram") + m.SetEmptyHistogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initHistDP(m.Histogram().DataPoints().AppendEmpty()) + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + int64SFxDataPoint("histogram_count", &sfxMetricTypeCumulativeCounter, labelMap, 16), + doubleSFxDataPoint("histogram_sum", &sfxMetricTypeCumulativeCounter, labelMap, 100.0), + doubleSFxDataPoint("histogram_min", &sfxMetricTypeGauge, labelMap, 0.1), + doubleSFxDataPoint("histogram_max", &sfxMetricTypeGauge, labelMap, 11.11), + }, + }, + { + name: "histogram_no_optional", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + m := ilm.Metrics().AppendEmpty() + m.SetName("histogram") + m.SetEmptyHistogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + initHistDPNoOptional(m.Histogram().DataPoints().AppendEmpty()) + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + int64SFxDataPoint("histogram_count", &sfxMetricTypeCumulativeCounter, labelMap, 16), + }, + }, + { + name: "delta_histogram", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + m := ilm.Metrics().AppendEmpty() + m.SetName("delta_histogram") + m.SetEmptyHistogram().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) + initHistDP(m.Histogram().DataPoints().AppendEmpty()) + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + int64SFxDataPoint("delta_histogram_count", &sfxMetricTypeCounter, labelMap, 16), + doubleSFxDataPoint("delta_histogram_sum", &sfxMetricTypeCounter, labelMap, 100.0), + doubleSFxDataPoint("delta_histogram_min", &sfxMetricTypeGauge, labelMap, 0.1), + doubleSFxDataPoint("delta_histogram_max", &sfxMetricTypeGauge, labelMap, 11.11), + }, + }, + { + name: "distribution_no_buckets", + metricsFn: func() pmetric.Metrics { + out := pmetric.NewMetrics() + ilm := out.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() + m := ilm.Metrics().AppendEmpty() + m.SetName("no_bucket_histo") + dp := m.SetEmptyHistogram().DataPoints().AppendEmpty() + dp.SetCount(2) + dp.SetSum(10) + dp.SetTimestamp(ts) + attrMap.CopyTo(dp.Attributes()) + return out + }, + wantSfxDataPoints: []*sfxpb.DataPoint{ + int64SFxDataPoint("no_bucket_histo_count", &sfxMetricTypeCumulativeCounter, labelMap, 2), + doubleSFxDataPoint("no_bucket_histo_sum", &sfxMetricTypeCumulativeCounter, labelMap, 10), + }, + }, + } + for _, tt := range testsWithDropHistogramBuckets { + t.Run(tt.name, func(t *testing.T) { + from := &FromTranslator{} + gotSfxDataPoints, err := from.FromMetrics(tt.metricsFn(), true) require.NoError(t, err) // Sort SFx dimensions since they are built from maps and the order // of those is not deterministic. diff --git a/pkg/winperfcounters/metadata.yaml b/pkg/winperfcounters/metadata.yaml index 49f2050b2c4a..10c8d02f9885 100644 --- a/pkg/winperfcounters/metadata.yaml +++ b/pkg/winperfcounters/metadata.yaml @@ -1,3 +1,3 @@ status: codeowners: - active: [dashpole, mrod1598, binaryfissiongames] \ No newline at end of file + active: [dashpole, Mrod1598, BinaryFissionGames] \ No newline at end of file diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index c5ef830baa0e..77af0868a96c 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -26,7 +26,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 3c479b77c726..481cb48ab699 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -108,8 +108,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/processor/datadogprocessor/README.md b/processor/datadogprocessor/README.md index fc449f86eb6d..11be94975741 100644 --- a/processor/datadogprocessor/README.md +++ b/processor/datadogprocessor/README.md @@ -2,17 +2,20 @@ | Status | | | ------------- |-----------| -| Stability | [beta]: traces | +| Stability | [deprecated]: traces | | Distributions | [contrib] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fdatadog%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fdatadog) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fdatadog%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fdatadog) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mx-psi](https://www.github.com/mx-psi), [@gbbr](https://www.github.com/gbbr), [@dineshg13](https://www.github.com/dineshg13) | -[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta +[deprecated]: https://github.com/open-telemetry/opentelemetry-collector#deprecated [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib ## Description + +This component has been deprecated in favor of its successor the [Datadog Connector](../../connector/datadogconnector/README.md) which serves the same purpose and should be used in place of the Datadog processor. + The Datadog Processor can be used to compute Datadog APM Stats pre-sampling. For example, when using the [tailsamplingprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor#tail-sampling-processor) or [probabilisticsamplerprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/probabilisticsamplerprocessor) components, the `datadogprocessor` can be prepended into the pipeline to ensure that Datadog APM Stats are accurate and include the dropped traces. ## Usage diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 2161cc70ff35..99aa0d27de7e 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -1,3 +1,4 @@ +// Deprecated: Use Datadog connector instead. module github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor go 1.20 @@ -43,7 +44,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 1985f1a1e6f1..96ee2a777c60 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -151,8 +151,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ 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.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/processor/datadogprocessor/internal/metadata/generated_status.go b/processor/datadogprocessor/internal/metadata/generated_status.go index 6edfdc3c4702..be67fe78208d 100644 --- a/processor/datadogprocessor/internal/metadata/generated_status.go +++ b/processor/datadogprocessor/internal/metadata/generated_status.go @@ -8,5 +8,5 @@ import ( const ( Type = "datadog" - TracesStability = component.StabilityLevelBeta + TracesStability = component.StabilityLevelDeprecated ) diff --git a/processor/datadogprocessor/metadata.yaml b/processor/datadogprocessor/metadata.yaml index f48f725eeac6..80ff82696738 100644 --- a/processor/datadogprocessor/metadata.yaml +++ b/processor/datadogprocessor/metadata.yaml @@ -3,7 +3,7 @@ type: datadog status: class: processor stability: - beta: [traces] + deprecated: [traces] distributions: [contrib] codeowners: active: [mx-psi, gbbr, dineshg13] \ No newline at end of file diff --git a/processor/datadogprocessor/processor.go b/processor/datadogprocessor/processor.go index 55e067fd40cd..7680c45f8a0f 100644 --- a/processor/datadogprocessor/processor.go +++ b/processor/datadogprocessor/processor.go @@ -51,6 +51,7 @@ func newProcessor(ctx context.Context, logger *zap.Logger, config component.Conf if err != nil { return nil, err } + logger.Warn("This component is deprecated in favor of the Datadog connector") return &datadogProcessor{ logger: logger, nextConsumer: nextConsumer, diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 03bfa95a0aac..ca7bf2b06596 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -25,7 +25,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 3c479b77c726..481cb48ab699 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -108,8 +108,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/processor/groupbyattrsprocessor/processor.go b/processor/groupbyattrsprocessor/processor.go index a06200b2ce5e..9bcd6a9c587c 100644 --- a/processor/groupbyattrsprocessor/processor.go +++ b/processor/groupbyattrsprocessor/processor.go @@ -110,6 +110,7 @@ func (gap *groupByAttrsProcessor) processMetrics(ctx context.Context, md pmetric for k := 0; k < ilm.Metrics().Len(); k++ { metric := ilm.Metrics().At(k) + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeGauge: @@ -205,6 +206,7 @@ func getMetricInInstrumentationLibrary(ilm pmetric.ScopeMetrics, searchedMetric metric.SetUnit(searchedMetric.Unit()) // Move other special type specific values + //exhaustive:enforce switch searchedMetric.Type() { case pmetric.MetricTypeHistogram: diff --git a/processor/k8sattributesprocessor/README.md b/processor/k8sattributesprocessor/README.md index 1d4a92c4925a..e314a5c6d2a9 100644 --- a/processor/k8sattributesprocessor/README.md +++ b/processor/k8sattributesprocessor/README.md @@ -3,12 +3,13 @@ | Status | | | ------------- |-----------| | Stability | [beta]: logs, metrics, traces | -| Distributions | [contrib], [observiq], [redhat], [splunk], [sumo] | +| Distributions | [contrib], [aws], [observiq], [redhat], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fk8sattributes%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fk8sattributes) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fk8sattributes%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fk8sattributes) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@rmfitzpatrick](https://www.github.com/rmfitzpatrick), [@fatsheep9146](https://www.github.com/fatsheep9146) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@rmfitzpatrick](https://www.github.com/rmfitzpatrick), [@fatsheep9146](https://www.github.com/fatsheep9146), [@TylerHelmuth](https://www.github.com/TylerHelmuth) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib +[aws]: https://github.com/aws-observability/aws-otel-collector [observiq]: https://github.com/observIQ/observiq-otel-collector [redhat]: https://github.com/os-observability/redhat-opentelemetry-collector [splunk]: https://github.com/signalfx/splunk-otel-collector diff --git a/processor/k8sattributesprocessor/e2e_test.go b/processor/k8sattributesprocessor/e2e_test.go index 2f92bbfd245d..11c7479f6e37 100644 --- a/processor/k8sattributesprocessor/e2e_test.go +++ b/processor/k8sattributesprocessor/e2e_test.go @@ -54,9 +54,8 @@ func newExpectedValue(mode int, value string) *expectedValue { // `/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 docker-telemetrygen +// make docker-otelcontribcol // KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image otelcontribcol:latest -// KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image telemetrygen:latest func TestE2E(t *testing.T) { kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) require.NoError(t, err) @@ -105,7 +104,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -127,7 +126,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -151,7 +150,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -173,7 +172,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -195,7 +194,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -217,7 +216,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -241,7 +240,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -263,7 +262,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -285,7 +284,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.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, ""), }, @@ -307,7 +306,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.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, ""), }, @@ -331,7 +330,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -353,7 +352,7 @@ func TestE2E(t *testing.T) { "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, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 277105541330..e7457ec4de2c 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/google/go-cmp v0.5.9 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 06ae2f5613a5..416a29aa417e 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -874,8 +874,9 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/processor/k8sattributesprocessor/metadata.yaml b/processor/k8sattributesprocessor/metadata.yaml index 33afa9a2f0d0..03e8a388e299 100644 --- a/processor/k8sattributesprocessor/metadata.yaml +++ b/processor/k8sattributesprocessor/metadata.yaml @@ -4,9 +4,9 @@ status: class: processor stability: beta: [logs, metrics, traces] - distributions: [contrib, splunk, observiq, sumo, redhat] + distributions: [contrib, splunk, observiq, sumo, redhat, aws] codeowners: - active: [dmitryax, rmfitzpatrick, fatsheep9146] + active: [dmitryax, rmfitzpatrick, fatsheep9146, TylerHelmuth] # resource attributes are exposed through a different configuration interface (extract::metadata). resource_attributes: k8s.cluster.uid: diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml index 2e3ca11b31e2..9d8effb27124 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml @@ -24,7 +24,9 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-daemonset" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never +{{- if eq .DataType "traces" }} + - --status-code= +{{- end }} + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen restartPolicy: Always diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml index 05ccc2c1601c..bc31edac33ed 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml @@ -25,7 +25,10 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-deployment" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never +{{- 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/telemetrygen/job.yaml index 930fa8e9e3be..b979daa5ad4f 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml @@ -21,7 +21,9 @@ spec: - --duration=36000s - --otlp-attributes=service.name="test-{{ .DataType }}-job" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never +{{- if eq .DataType "traces" }} + - --status-code= +{{- end }} + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen - restartPolicy: OnFailure + restartPolicy: Never diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml index 395ca8918d87..6dcb9a2739ae 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml @@ -26,7 +26,9 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-statefulset" - --otlp-attributes=k8s.container.name="telemetrygen" - image: "telemetrygen:latest" - imagePullPolicy: Never +{{- if eq .DataType "traces" }} + - --status-code= +{{- end }} + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen restartPolicy: Always diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 09b80cd3c174..6e0e98b30e15 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -46,7 +46,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 91686ac71550..dbcb2aa8e6b8 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -417,8 +417,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index e3d3f3fd742d..c3720a750ad2 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -31,7 +31,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -82,7 +82,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index bf827b029e76..37b220df0183 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -193,8 +193,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -711,8 +711,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index c6e6986157ef..9be2e5c3a3da 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cloud.google.com/go/compute/metadata v0.2.3 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/google/go-cmp v0.5.9 github.com/hashicorp/consul/api v1.24.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.83.0 @@ -52,7 +52,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 83106574a963..8351294b0829 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -26,8 +26,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -157,8 +157,8 @@ github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 8c020a9cc13c..a1f9d8ef99e0 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -33,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 96d0abb94ce1..c00d214db3eb 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -822,8 +822,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index bd7ddba51b9b..b13e3a4042b5 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -38,7 +38,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -99,7 +99,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index f3683839f220..a4f7d6b33e26 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -823,8 +823,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -1591,8 +1592,8 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index dcf4fb7a5a98..afbed1a30e2d 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -24,7 +24,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 00a6f1e92bd2..5dc99d73ddce 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -106,8 +106,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index faf7e8929ac1..67947c3fb090 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.83.0 @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/processor v0.83.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/otel/trace v1.17.0 go.uber.org/goleak v1.2.1 go.uber.org/zap v1.25.0 ) @@ -41,8 +41,8 @@ require ( go.opentelemetry.io/collector/exporter v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/receiver v0.83.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect golang.org/x/net v0.14.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index b4b4b46343ed..254fd9515951 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -109,8 +109,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -300,15 +300,15 @@ go.opentelemetry.io/collector/processor v0.83.0 h1:oWMpPzHLkzlPXRIa27UsfsaDSbXaF go.opentelemetry.io/collector/processor v0.83.0/go.mod h1:sLxTTqkIhmNtekO0HebXgVclPpm/xoQ4+g8CbzgYBCM= go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= diff --git a/processor/transformprocessor/README.md b/processor/transformprocessor/README.md index 515bcf30cc1e..8b55b01ee29f 100644 --- a/processor/transformprocessor/README.md +++ b/processor/transformprocessor/README.md @@ -116,7 +116,7 @@ transform: statements: - set(severity_text, "FAIL") where body == "request failed" - replace_all_matches(attributes, "/user/*/list/*", "/user/{userId}/list/{listId}") - - replace_all_patterns(attributes, "/account/\\d{4}", "/account/{accountId}") + - replace_all_patterns(attributes, "value", "/account/\\d{4}", "/account/{accountId}") - set(body, attributes["http.route"]) ``` @@ -365,7 +365,7 @@ transform: - context: resource statements: # Use Concat function to combine any number of string, separated by a delimiter. - - set(attributes["test"], Concat([attributes["foo"], attributes["bar"]], " ") + - set(attributes["test"], Concat([attributes["foo"], attributes["bar"]], " ")) ``` ### Parsing JSON logs diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 861a8cf3233a..b2c975234c46 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -20,7 +20,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 4ba2814336f0..57ceb59a404f 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -103,8 +103,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/activedirectorydsreceiver/README.md b/receiver/activedirectorydsreceiver/README.md index 311a77973d71..338cbde1df61 100644 --- a/receiver/activedirectorydsreceiver/README.md +++ b/receiver/activedirectorydsreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [beta]: metrics | | Distributions | [contrib], [observiq], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Factivedirectoryds%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Factivedirectoryds) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Factivedirectoryds%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Factivedirectoryds) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@binaryfissiongames](https://www.github.com/binaryfissiongames) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@BinaryFissionGames](https://www.github.com/BinaryFissionGames) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/activedirectorydsreceiver/metadata.yaml b/receiver/activedirectorydsreceiver/metadata.yaml index da3bbd1edf65..57cff4929074 100644 --- a/receiver/activedirectorydsreceiver/metadata.yaml +++ b/receiver/activedirectorydsreceiver/metadata.yaml @@ -6,7 +6,7 @@ status: beta: [metrics] distributions: [contrib, observiq, sumo] codeowners: - active: [djaglowski, binaryfissiongames] + active: [djaglowski, BinaryFissionGames] attributes: direction: diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 39489e1a8f94..12894adc0e0f 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -36,7 +36,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 85f4fa6fa527..8c590c717b66 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -142,8 +142,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index f9d3a44fc604..4531e39ccdd0 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -38,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 5d54c112524e..2a8510c5ad51 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/apachereceiver/testdata/scraper/expected.yaml b/receiver/apachereceiver/testdata/scraper/expected.yaml index 615b6d63509c..83bf3862fb66 100644 --- a/receiver/apachereceiver/testdata/scraper/expected.yaml +++ b/receiver/apachereceiver/testdata/scraper/expected.yaml @@ -13,7 +13,7 @@ resourceMetrics: gauge: dataPoints: - asDouble: 0.66 - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" name: apache.cpu.load unit: '%' - description: Jiffs used by processes of given category. @@ -29,7 +29,7 @@ resourceMetrics: - key: mode value: stringValue: system - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asDouble: 0.02 attributes: - key: level @@ -38,7 +38,7 @@ resourceMetrics: - key: mode value: stringValue: user - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asDouble: 0.03 attributes: - key: level @@ -47,7 +47,7 @@ resourceMetrics: - key: mode value: stringValue: system - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asDouble: 0.04 attributes: - key: level @@ -56,7 +56,7 @@ resourceMetrics: - key: mode value: stringValue: user - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" isMonotonic: true unit: '{jiff}' - description: The number of active connections currently attached to the HTTP server. @@ -65,27 +65,27 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "110" - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" unit: '{connections}' - description: The average server load during the last minute. gauge: dataPoints: - asDouble: 0.9 - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" name: apache.load.1 unit: '%' - description: The average server load during the last 15 minutes. gauge: dataPoints: - asDouble: 0.3 - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" name: apache.load.15 unit: '%' - description: The average server load during the last 5 minutes. gauge: dataPoints: - asDouble: 0.4 - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" name: apache.load.5 unit: '%' - description: Total time spent on handling requests. @@ -94,7 +94,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1501" - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" isMonotonic: true unit: ms - description: The number of requests serviced by the HTTP server per second. @@ -103,7 +103,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14169" - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' - description: The number of workers in each state. @@ -116,67 +116,67 @@ resourceMetrics: - key: state value: stringValue: closing - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: state value: stringValue: dnslookup - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "3" attributes: - key: state value: stringValue: finishing - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "4" attributes: - key: state value: stringValue: idle_cleanup - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: state value: stringValue: keepalive - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: state value: stringValue: logging - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "150" attributes: - key: state value: stringValue: open - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "4" attributes: - key: state value: stringValue: reading - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "12" attributes: - key: state value: stringValue: sending - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: state value: stringValue: starting - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "217" attributes: - key: state value: stringValue: waiting - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" unit: '{workers}' - description: Total HTTP server traffic. name: apache.traffic @@ -184,7 +184,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21411840" - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: The amount of time that the server has been running in seconds. @@ -193,7 +193,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "410" - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" isMonotonic: true unit: s - description: The number of workers currently attached to the HTTP server. @@ -206,13 +206,13 @@ resourceMetrics: - key: state value: stringValue: busy - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" - asInt: "227" attributes: - key: state value: stringValue: idle - timeUnixNano: "1632495518500962000" + timeUnixNano: "1000000" unit: '{workers}' scope: name: otelcol/apachereceiver diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index 73ddcfc83a22..d9d6ed579890 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -37,7 +37,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index c534828dc251..be95c6e11d42 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_golden.yaml index 3b66bd83dc3e..371e8922bacd 100644 --- a/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: mb - description: Memory usage for the driver's BlockManager. name: spark.driver.block_manager.memory.usage @@ -31,8 +31,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -41,8 +41,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "434" attributes: - key: location @@ -51,8 +51,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -61,15 +61,15 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: mb - description: Average time spent during CodeGenerator source code compilation operations. gauge: dataPoints: - asDouble: 102.34631777515023 - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.compilation.average_time unit: ms - description: Number of source code compilation operations performed by the CodeGenerator. @@ -78,16 +78,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ compilation }' - description: Average class size of the classes generated by the CodeGenerator. gauge: dataPoints: - asDouble: 2409.8125357816552 - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.generated_class.average_size unit: bytes - description: Number of classes generated by the CodeGenerator. @@ -96,16 +96,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ class }' - description: Average method size of the classes generated by the CodeGenerator. gauge: dataPoints: - asDouble: 61.34019077461248 - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.generated_method.average_size unit: bytes - description: Number of methods generated by the CodeGenerator. @@ -114,16 +114,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "81" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ method }' - description: Average size of the source code generated by a CodeGenerator code generation operation. gauge: dataPoints: - asDouble: 5193.878352804497 - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.source_code.average_size unit: bytes - description: Number of source code generation operations performed by the CodeGenerator. @@ -132,8 +132,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ operation }' - description: Number of active jobs currently being processed by the DAGScheduler. @@ -142,8 +142,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ job }' - description: Number of jobs that have been submitted to the DAGScheduler. name: spark.driver.dag_scheduler.job.count @@ -151,8 +151,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ job }' - description: Number of stages the DAGScheduler is either running or needs to run. @@ -165,15 +165,15 @@ resourceMetrics: - key: status value: stringValue: running - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: waiting - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ stage }' - description: Number of failed stages run by the DAGScheduler. name: spark.driver.dag_scheduler.stage.failed @@ -181,8 +181,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ stage }' - description: Number of garbage collection operations performed by the driver. @@ -195,15 +195,15 @@ resourceMetrics: - key: gc_type value: stringValue: major - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: gc_type value: stringValue: minor - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ gc_operation }' - description: Total elapsed time during garbage collection operations performed by the driver. @@ -216,15 +216,15 @@ resourceMetrics: - key: gc_type value: stringValue: major - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "97" attributes: - key: gc_type value: stringValue: minor - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Amount of execution memory currently used by the driver. @@ -237,15 +237,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of memory used by the driver's JVM. name: spark.driver.executor.memory.jvm @@ -257,15 +257,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "154858904" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of pool memory currently used by the driver. name: spark.driver.executor.memory.pool @@ -277,15 +277,15 @@ resourceMetrics: - key: type value: stringValue: direct - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: type value: stringValue: mapped - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of storage memory currently used by the driver. name: spark.driver.executor.memory.storage @@ -297,15 +297,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "578796" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Number of file cache hits on the HiveExternalCatalog. name: spark.driver.hive_external_catalog.file_cache_hits @@ -313,8 +313,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ hit }' - description: Number of files discovered while listing the partitions of a table in the Hive metastore @@ -323,8 +323,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ file }' - description: Number of calls to the underlying Hive Metastore client made by the Spark application. @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ call }' - description: Number of parallel listing jobs initiated by the HiveExternalCatalog when listing partitions of a table. @@ -343,8 +343,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ listing_job }' - description: Table partitions fetched by the HiveExternalCatalog. @@ -353,8 +353,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ partition }' - description: Current CPU time taken by the Spark driver. @@ -363,8 +363,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "32742193000" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Number of events that have been dropped by the LiveListenerBus. @@ -373,8 +373,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ event }' - description: Number of events that have been posted on the LiveListenerBus. @@ -383,16 +383,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "248" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ event }' - description: Average time taken for the LiveListenerBus to process an event posted to it. gauge: dataPoints: - asDouble: 2.570765936935471 - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.live_listener_bus.processing_time.average unit: ms - description: Number of events currently waiting to be processed by the LiveListenerBus. @@ -401,8 +401,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ event }' scope: name: otelcol/apachesparkreceiver @@ -426,8 +426,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Elapsed time the JVM spent in garbage collection in this executor. name: spark.executor.gc_time @@ -435,8 +435,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "221" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Amount of data input for this executor. @@ -445,8 +445,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Storage memory used by this executor. @@ -455,8 +455,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "100596" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of data written and read during shuffle operations for this executor. name: spark.executor.shuffle.io.size @@ -468,15 +468,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: The executor's storage memory usage. @@ -492,8 +492,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -502,8 +502,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -512,8 +512,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -522,8 +522,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Number of tasks currently running in this executor. name: spark.executor.task.active @@ -531,8 +531,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Maximum number of tasks that can run concurrently in this executor. name: spark.executor.task.limit @@ -540,8 +540,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Number of tasks with a specific result in this executor. name: spark.executor.task.result @@ -553,15 +553,15 @@ resourceMetrics: - key: result value: stringValue: completed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: failed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ task }' - description: Elapsed time the JVM spent executing tasks in this executor. @@ -570,8 +570,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "149891" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms scope: @@ -596,8 +596,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Number of stages with a specific result in this job. name: spark.job.stage.result @@ -609,22 +609,22 @@ resourceMetrics: - key: result value: stringValue: completed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: failed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: skipped - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ task }' - description: Number of active tasks in this job. @@ -633,8 +633,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Number of tasks with a specific result in this job. name: spark.job.task.result @@ -646,22 +646,22 @@ resourceMetrics: - key: result value: stringValue: completed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: failed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: skipped - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ task }' scope: @@ -686,8 +686,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: CPU time spent by the executor in this stage. @@ -696,8 +696,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1505965000" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Amount of time spent by the executor in this stage. @@ -706,8 +706,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8927" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of records written and read in this stage. @@ -720,15 +720,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ record }' - description: Amount of data written and read at this stage. @@ -741,15 +741,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: The amount of time the JVM spent on garbage collection in this stage. @@ -758,8 +758,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "156" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Peak memory used by internal data structures created during shuffles, aggregations and joins in this stage. @@ -768,8 +768,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3145728" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: The amount of memory moved to disk due to size constraints (spilled) in this stage. @@ -778,8 +778,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Number of blocks fetched in shuffle operations in this stage. @@ -792,15 +792,15 @@ resourceMetrics: - key: source value: stringValue: local - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: source value: stringValue: remote - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ block }' - description: Time spent in this stage waiting for remote shuffle blocks. @@ -809,8 +809,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Amount of data read to disk in shuffle operations (sometimes required for large blocks, as opposed to the default behavior of reading into memory). @@ -819,8 +819,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Amount of data read in shuffle operations in this stage. @@ -833,15 +833,15 @@ resourceMetrics: - key: source value: stringValue: local - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: source value: stringValue: remote - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Number of records written or read in shuffle operations in this stage. @@ -854,15 +854,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ record }' - description: Amount of data written in shuffle operations in this stage. @@ -871,8 +871,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Time spent blocking on writes to disk or buffer cache in this stage. @@ -881,8 +881,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: A one-hot encoding representing the status of this stage. @@ -904,8 +904,8 @@ resourceMetrics: - key: pending value: boolValue: false - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ status }' - description: Number of active tasks in this stage. name: spark.stage.task.active @@ -913,8 +913,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Number of tasks with a specific result in this stage. name: spark.stage.task.result @@ -926,22 +926,22 @@ resourceMetrics: - key: result value: stringValue: completed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: failed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: killed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ task }' - description: The amount of data transmitted back to the driver by all the tasks in this stage. @@ -950,8 +950,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29568" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes scope: @@ -976,8 +976,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: CPU time spent by the executor in this stage. @@ -986,8 +986,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8516746000" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Amount of time spent by the executor in this stage. @@ -996,8 +996,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "96205" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of records written and read in this stage. @@ -1010,15 +1010,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ record }' - description: Amount of data written and read at this stage. @@ -1031,15 +1031,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: The amount of time the JVM spent on garbage collection in this stage. @@ -1048,8 +1048,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1370" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Peak memory used by internal data structures created during shuffles, aggregations and joins in this stage. @@ -1058,8 +1058,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "157286400" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: The amount of memory moved to disk due to size constraints (spilled) in this stage. @@ -1068,8 +1068,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Number of blocks fetched in shuffle operations in this stage. @@ -1082,15 +1082,15 @@ resourceMetrics: - key: source value: stringValue: local - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: source value: stringValue: remote - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ block }' - description: Time spent in this stage waiting for remote shuffle blocks. @@ -1099,8 +1099,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Amount of data read to disk in shuffle operations (sometimes required for large blocks, as opposed to the default behavior of reading into memory). @@ -1109,8 +1109,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Amount of data read in shuffle operations in this stage. @@ -1123,15 +1123,15 @@ resourceMetrics: - key: source value: stringValue: local - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: source value: stringValue: remote - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Number of records written or read in shuffle operations in this stage. @@ -1144,15 +1144,15 @@ resourceMetrics: - key: direction value: stringValue: in - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: out - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ record }' - description: Amount of data written in shuffle operations in this stage. @@ -1161,8 +1161,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes - description: Time spent blocking on writes to disk or buffer cache in this stage. @@ -1171,8 +1171,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: A one-hot encoding representing the status of this stage. @@ -1194,8 +1194,8 @@ resourceMetrics: - key: pending value: boolValue: false - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ status }' - description: Number of active tasks in this stage. name: spark.stage.task.active @@ -1203,8 +1203,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ task }' - description: Number of tasks with a specific result in this stage. name: spark.stage.task.result @@ -1216,22 +1216,22 @@ resourceMetrics: - key: result value: stringValue: completed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: failed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: result value: stringValue: killed - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ task }' - description: The amount of data transmitted back to the driver by all the tasks in this stage. @@ -1240,8 +1240,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1478081" - startTimeUnixNano: "1684779501751836000" - timeUnixNano: "1684779501753732000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: bytes scope: diff --git a/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_partial_golden.yaml b/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_partial_golden.yaml index 570a7587e764..db4501b1b6d2 100644 --- a/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_partial_golden.yaml +++ b/receiver/apachesparkreceiver/testdata/expected_metrics/metrics_partial_golden.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: mb - description: Memory usage for the driver's BlockManager. name: spark.driver.block_manager.memory.usage @@ -31,8 +31,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -41,8 +41,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "434" attributes: - key: location @@ -51,8 +51,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location @@ -61,15 +61,15 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: mb - description: Average time spent during CodeGenerator source code compilation operations. gauge: dataPoints: - asDouble: 102.34631777515023 - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.compilation.average_time unit: ms - description: Number of source code compilation operations performed by the CodeGenerator. @@ -78,16 +78,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ compilation }' - description: Average class size of the classes generated by the CodeGenerator. gauge: dataPoints: - asDouble: 2409.8125357816552 - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.generated_class.average_size unit: bytes - description: Number of classes generated by the CodeGenerator. @@ -96,16 +96,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ class }' - description: Average method size of the classes generated by the CodeGenerator. gauge: dataPoints: - asDouble: 61.34019077461248 - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.generated_method.average_size unit: bytes - description: Number of methods generated by the CodeGenerator. @@ -114,16 +114,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "81" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ method }' - description: Average size of the source code generated by a CodeGenerator code generation operation. gauge: dataPoints: - asDouble: 5193.878352804497 - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.code_generator.source_code.average_size unit: bytes - description: Number of source code generation operations performed by the CodeGenerator. @@ -132,8 +132,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ operation }' - description: Number of active jobs currently being processed by the DAGScheduler. @@ -142,8 +142,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ job }' - description: Number of jobs that have been submitted to the DAGScheduler. name: spark.driver.dag_scheduler.job.count @@ -151,8 +151,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ job }' - description: Number of stages the DAGScheduler is either running or needs to run. @@ -165,15 +165,15 @@ resourceMetrics: - key: status value: stringValue: running - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: waiting - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ stage }' - description: Number of failed stages run by the DAGScheduler. name: spark.driver.dag_scheduler.stage.failed @@ -181,8 +181,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ stage }' - description: Number of garbage collection operations performed by the driver. @@ -195,15 +195,15 @@ resourceMetrics: - key: gc_type value: stringValue: major - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: gc_type value: stringValue: minor - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ gc_operation }' - description: Total elapsed time during garbage collection operations performed by the driver. @@ -216,15 +216,15 @@ resourceMetrics: - key: gc_type value: stringValue: major - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "97" attributes: - key: gc_type value: stringValue: minor - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Amount of execution memory currently used by the driver. @@ -237,15 +237,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of memory used by the driver's JVM. name: spark.driver.executor.memory.jvm @@ -257,15 +257,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "154858904" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of pool memory currently used by the driver. name: spark.driver.executor.memory.pool @@ -277,15 +277,15 @@ resourceMetrics: - key: type value: stringValue: direct - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: type value: stringValue: mapped - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Amount of storage memory currently used by the driver. name: spark.driver.executor.memory.storage @@ -297,15 +297,15 @@ resourceMetrics: - key: location value: stringValue: off_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "578796" attributes: - key: location value: stringValue: on_heap - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: bytes - description: Number of file cache hits on the HiveExternalCatalog. name: spark.driver.hive_external_catalog.file_cache_hits @@ -313,8 +313,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ hit }' - description: Number of files discovered while listing the partitions of a table in the Hive metastore @@ -323,8 +323,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ file }' - description: Number of calls to the underlying Hive Metastore client made by the Spark application. @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ call }' - description: Number of parallel listing jobs initiated by the HiveExternalCatalog when listing partitions of a table. @@ -343,8 +343,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ listing_job }' - description: Table partitions fetched by the HiveExternalCatalog. @@ -353,8 +353,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ partition }' - description: Current CPU time taken by the Spark driver. @@ -363,8 +363,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "32742193000" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Number of events that have been dropped by the LiveListenerBus. @@ -373,8 +373,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ event }' - description: Number of events that have been posted on the LiveListenerBus. @@ -383,16 +383,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "248" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{ event }' - description: Average time taken for the LiveListenerBus to process an event posted to it. gauge: dataPoints: - asDouble: 2.570765936935471 - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: spark.driver.live_listener_bus.processing_time.average unit: ms - description: Number of events currently waiting to be processed by the LiveListenerBus. @@ -401,8 +401,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1684779200175972000" - timeUnixNano: "1684779200176934000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{ event }' scope: name: otelcol/apachesparkreceiver diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 42e935176d89..cd808724fe35 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsclo go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 5a5e768477eb..33bf8976358e 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index a160240b10ab..46497ffde937 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscon go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/google/cadvisor v0.47.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.83.0 @@ -20,9 +20,9 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 go.uber.org/zap v1.25.0 - k8s.io/api v0.27.4 - k8s.io/apimachinery v0.27.4 - k8s.io/client-go v0.27.4 + k8s.io/api v0.28.1 + k8s.io/apimachinery v0.28.1 + k8s.io/client-go v0.28.1 k8s.io/klog v1.0.0 ) @@ -42,7 +42,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect - github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/frankban/quicktest v1.14.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -50,17 +50,17 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect 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/snappy v0.0.4 // indirect - github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -135,9 +135,9 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index fed600bbf650..7c4bade76c85 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -73,8 +73,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/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -159,8 +159,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -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/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/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -204,8 +204,8 @@ github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -213,7 +213,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh 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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= @@ -264,8 +264,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/cadvisor v0.47.3 h1:5XKTHBduWlBjmgw07uwEiC+Xa/FRd0MZI37oqlTagO0= github.com/google/cadvisor v0.47.3/go.mod h1:iJdTjcjyKHjLCf7OSTzwP5GxdfrkPusw2x5bwGvuLUw= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +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= 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= @@ -308,8 +308,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -468,10 +468,10 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= 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= @@ -537,7 +537,7 @@ github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8d 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.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -567,7 +567,6 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= 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= @@ -971,7 +970,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= 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= @@ -1044,7 +1043,6 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1145,7 +1143,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -1160,14 +1157,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.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= 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= @@ -1177,15 +1174,15 @@ 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.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go b/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go index 6462c5cc59c8..cc7b2b309a20 100644 --- a/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go +++ b/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go @@ -219,7 +219,7 @@ func (k *K8sAPIServer) init() error { } lock, err := resourcelock.New( - resourcelock.ConfigMapsLeasesResourceLock, + resourcelock.LeasesResourceLock, lockNamespace, lockName, clientSet.CoreV1(), clientSet.CoordinationV1(), diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index d0b9b21971d1..467000aab040 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecs go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 6018806cd4fd..d59eb1cee15b 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -11,8 +11,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 83c57afb7e2d..f2d1ee99f8df 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxra go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.323 + github.com/aws/aws-sdk-go v1.44.329 github.com/google/go-cmp v0.5.9 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index c264f8be0e3f..7eb5ab7687d0 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -46,8 +46,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -180,8 +180,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 952c44886a00..b9668ba29dc4 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -45,7 +45,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -103,7 +103,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 46934a40bba4..ea052a5a77c0 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -242,8 +242,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -773,8 +773,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index adee8892aab5..e3d96cac5b8b 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -48,7 +48,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.4.3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -104,7 +104,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index b92fd7b15250..6b6a5f748712 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -233,8 +233,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -763,8 +763,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index d1424600bbdb..4314fad00ae2 100644 --- a/receiver/azuremonitorreceiver/go.mod +++ b/receiver/azuremonitorreceiver/go.mod @@ -28,7 +28,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/receiver/azuremonitorreceiver/go.sum b/receiver/azuremonitorreceiver/go.sum index 0f1cf2dc0636..ab0748492bcd 100644 --- a/receiver/azuremonitorreceiver/go.sum +++ b/receiver/azuremonitorreceiver/go.sum @@ -119,8 +119,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/azuremonitorreceiver/scraper.go b/receiver/azuremonitorreceiver/scraper.go index 1088f7871d6e..afa0deaf4337 100644 --- a/receiver/azuremonitorreceiver/scraper.go +++ b/receiver/azuremonitorreceiver/scraper.go @@ -7,6 +7,7 @@ import ( "bytes" "context" "fmt" + "regexp" "sort" "strings" "sync" @@ -49,16 +50,19 @@ var ( ) const ( - tagPrefix = "tags_" - metadataPrefix = "metadata_" - location = "location" + attributeLocation = "location" + attributeName = "name" + attributeResourceGroup = "resource_group" + attributeResourceType = "type" + metadataPrefix = "metadata_" + tagPrefix = "tags_" ) type azureResource struct { + attributes map[string]*string metricsByCompositeKey map[metricsCompositeKey]*azureResourceMetrics metricsDefinitionsUpdated time.Time tags map[string]*string - location string } type metricsCompositeKey struct { @@ -201,11 +205,19 @@ func (s *azureScraper) getResources(ctx context.Context) { return } for _, resource := range nextResult.Value { - if _, ok := s.resources[*resource.ID]; !ok { - s.resources[*resource.ID] = &azureResource{tags: resource.Tags} + resourceGroup := getResourceGroupFromID(*resource.ID) + attributes := map[string]*string{ + attributeName: resource.Name, + attributeResourceGroup: &resourceGroup, + attributeResourceType: resource.Type, + } if resource.Location != nil { - s.resources[*resource.ID].location = *resource.Location + attributes[attributeLocation] = resource.Location + } + s.resources[*resource.ID] = &azureResource{ + attributes: attributes, + tags: resource.Tags, } } delete(existingResources, *resource.ID) @@ -220,6 +232,16 @@ func (s *azureScraper) getResources(ctx context.Context) { s.resourcesUpdated = time.Now() } +func getResourceGroupFromID(id string) string { + var s = regexp.MustCompile(`\/resourcegroups/([^\/]+)\/`) + match := s.FindStringSubmatch(strings.ToLower(id)) + + if len(match) == 2 { + return match[1] + } + return "" +} + func (s *azureScraper) getResourcesFilter() string { // TODO: switch to parsing services from // https://learn.microsoft.com/en-us/azure/azure-monitor/essentials/metrics-supported @@ -264,11 +286,9 @@ func (s *azureScraper) getResourceMetricsDefinitions(ctx context.Context, resour } } sort.Strings(dimensionsSlice) - dimensionsCompositeKey := metricsCompositeKey{timeGrain: timeGrain, dimensions: strings.Join(dimensionsSlice, ",")} - s.storeMetricsDefinition(resourceID, name, dimensionsCompositeKey) - } else { - s.storeMetricsDefinition(resourceID, name, compositeKey) + compositeKey.dimensions = strings.Join(dimensionsSlice, ",") } + s.storeMetricsDefinition(resourceID, name, compositeKey) } } s.resources[resourceID].metricsDefinitionsUpdated = time.Now() @@ -325,15 +345,16 @@ func (s *azureScraper) getResourceMetricsValues(ctx context.Context, resourceID for _, metric := range result.Value { for _, timeseriesElement := range metric.Timeseries { + if timeseriesElement.Data != nil { attributes := map[string]*string{} + for name, value := range res.attributes { + attributes[name] = value + } for _, value := range timeseriesElement.Metadatavalues { name := metadataPrefix + *value.Name.Value attributes[name] = value.Value } - if len(res.location) > 0 { - attributes[location] = &res.location - } if s.cfg.AppendTagsAsAttributes { for tagName, value := range res.tags { name := tagPrefix + tagName diff --git a/receiver/azuremonitorreceiver/scraper_test.go b/receiver/azuremonitorreceiver/scraper_test.go index 95e5b00f7b16..12e8043340b1 100644 --- a/receiver/azuremonitorreceiver/scraper_test.go +++ b/receiver/azuremonitorreceiver/scraper_test.go @@ -233,11 +233,14 @@ func TestAzureScraperScrape(t *testing.T) { } func getResourcesMockData(tags bool) []armresources.ClientListResponse { - id1, id2, id3, location1 := "resourceId1", "resourceId2", "resourceId3", "location1" + id1, id2, id3, location1, name1, type1 := "/resourceGroups/group1/resourceId1", + "/resourceGroups/group1/resourceId2", "/resourceGroups/group1/resourceId3", "location1", "name1", "type1" resourceID1 := armresources.GenericResourceExpanded{ ID: &id1, Location: &location1, + Name: &name1, + Type: &type1, } if tags { tagName1, tagValue1 := "tagName1", "tagValue1" @@ -249,7 +252,10 @@ func getResourcesMockData(tags bool) []armresources.ClientListResponse { Value: []*armresources.GenericResourceExpanded{ &resourceID1, { - ID: &id2, + ID: &id2, + Location: &location1, + Name: &name1, + Type: &type1, }, }, }, @@ -258,7 +264,10 @@ func getResourcesMockData(tags bool) []armresources.ClientListResponse { ResourceListResult: armresources.ResourceListResult{ Value: []*armresources.GenericResourceExpanded{ { - ID: &id3, + ID: &id3, + Location: &location1, + Name: &name1, + Type: &type1, }, }, }, @@ -271,13 +280,13 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me "metric2", "metric3", "metric4", "metric5", "metric6", "metric7", "PT1M", "PT1H", "dimension1", "dimension2" counters := map[string]int{ - "resourceId1": 0, - "resourceId2": 0, - "resourceId3": 0, + "/resourceGroups/group1/resourceId1": 0, + "/resourceGroups/group1/resourceId2": 0, + "/resourceGroups/group1/resourceId3": 0, } pages := map[string][]armmonitor.MetricDefinitionsClientListResponse{ - "resourceId1": { + "/resourceGroups/group1/resourceId1": { { MetricDefinitionCollection: armmonitor.MetricDefinitionCollection{ Value: []*armmonitor.MetricDefinition{ @@ -315,7 +324,7 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me }, }, }, - "resourceId2": { + "/resourceGroups/group1/resourceId2": { { MetricDefinitionCollection: armmonitor.MetricDefinitionCollection{ Value: []*armmonitor.MetricDefinition{ @@ -366,7 +375,7 @@ func getMetricsDefinitionsMockData() (map[string]int, map[string][]armmonitor.Me }, }, }, - "resourceId3": { + "/resourceGroups/group1/resourceId3": { { MetricDefinitionCollection: armmonitor.MetricDefinitionCollection{ Value: []*armmonitor.MetricDefinition{ @@ -400,7 +409,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi var value1 float64 = 1 return map[string]map[string]armmonitor.MetricsClientListResponse{ - "resourceId1": { + "/resourceGroups/group1/resourceId1": { strings.Join([]string{name1, name2}, ","): { Response: armmonitor.Response{ Value: []*armmonitor.Metric{ @@ -471,7 +480,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi }, }, }, - "resourceId2": { + "/resourceGroups/group1/resourceId2": { name4: { Response: armmonitor.Response{ Value: []*armmonitor.Metric{ @@ -570,7 +579,7 @@ func getMetricsValuesMockData() map[string]map[string]armmonitor.MetricsClientLi }, }, }, - "resourceId3": { + "/resourceGroups/group1/resourceId3": { name7: { Response: armmonitor.Response{ Value: []*armmonitor.Metric{ diff --git a/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_golden.yaml index 9e5b3b66b319..a61f847c1e94 100644 --- a/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -15,16 +15,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - - key: metadata_dimension2 + stringValue: location1 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_average + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_maximum unit: unit1 - gauge: dataPoints: @@ -32,16 +38,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - - key: metadata_dimension2 + stringValue: location1 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_minimum + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_average unit: unit1 - gauge: dataPoints: @@ -49,13 +61,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId2 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_maximum + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_minimum unit: unit1 - gauge: dataPoints: @@ -63,13 +84,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_total unit: unit1 - gauge: dataPoints: @@ -77,13 +107,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_maximum + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_count unit: unit1 - gauge: dataPoints: @@ -91,13 +136,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_total + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_maximum unit: unit1 - gauge: dataPoints: @@ -105,13 +165,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_maximum + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_total unit: unit1 - gauge: dataPoints: @@ -119,13 +194,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_average unit: unit1 - gauge: dataPoints: @@ -133,12 +217,21 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: azure_metric3_maximum unit: unit1 - gauge: @@ -147,13 +240,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_total + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_maximum unit: unit1 - gauge: dataPoints: @@ -161,10 +266,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_minimum + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_total unit: unit1 - gauge: dataPoints: @@ -172,13 +289,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_minimum + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_total unit: unit1 - gauge: dataPoints: @@ -186,13 +312,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId2 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_total + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_average unit: unit1 - gauge: dataPoints: @@ -200,13 +335,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_minimum + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_maximum unit: unit1 - gauge: dataPoints: @@ -214,10 +358,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_count + stringValue: /resourceGroups/group1/resourceId3 + - key: location + value: + stringValue: location1 + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric7_count unit: unit1 - gauge: dataPoints: @@ -225,16 +384,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - key: metadata_dimension2 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_average unit: unit1 - gauge: dataPoints: @@ -242,13 +413,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_average unit: unit1 - gauge: dataPoints: @@ -256,13 +439,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_minimum + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_count unit: unit1 - gauge: dataPoints: @@ -270,10 +462,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_average + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_minimum unit: unit1 - gauge: dataPoints: @@ -281,10 +485,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_maximum + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_count unit: unit1 - gauge: dataPoints: @@ -292,16 +508,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - - key: metadata_dimension2 + stringValue: location1 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_total + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_total unit: unit1 - gauge: dataPoints: @@ -309,13 +531,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_total + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_count unit: unit1 - gauge: dataPoints: @@ -323,13 +554,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_average + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_count unit: unit1 - gauge: dataPoints: @@ -337,13 +577,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId3 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654674823" - name: azure_metric7_count + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_minimum unit: unit1 - gauge: dataPoints: @@ -351,13 +606,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_average + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_average unit: unit1 - gauge: dataPoints: @@ -365,13 +629,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_average + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_maximum unit: unit1 - gauge: dataPoints: @@ -379,12 +652,21 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: azure_metric2_minimum unit: unit1 - gauge: @@ -393,10 +675,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_total + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_minimum unit: unit1 - gauge: dataPoints: @@ -404,16 +701,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - - key: metadata_dimension2 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_maximum + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_total unit: unit1 - gauge: dataPoints: @@ -421,13 +727,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_average + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_minimum unit: unit1 - gauge: dataPoints: @@ -435,13 +750,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_count + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_count unit: unit1 scope: name: otelcol/azuremonitorreceiver diff --git a/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_tags_golden.yaml b/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_tags_golden.yaml index c191b9baf63e..3b3b38e92e54 100644 --- a/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_tags_golden.yaml +++ b/receiver/azuremonitorreceiver/testdata/expected_metrics/metrics_tags_golden.yaml @@ -15,16 +15,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - key: metadata_dimension2 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_average + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_minimum unit: unit1 - gauge: dataPoints: @@ -32,16 +44,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - - key: metadata_dimension2 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_minimum + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_average unit: unit1 - gauge: dataPoints: @@ -49,13 +70,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId1 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_maximum + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: tags_tagName1 + value: + stringValue: tagValue1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_average unit: unit1 - gauge: dataPoints: @@ -63,16 +96,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_count + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_minimum unit: unit1 - gauge: dataPoints: @@ -80,16 +122,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_maximum + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_average unit: unit1 - gauge: dataPoints: @@ -97,16 +148,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_total + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_count unit: unit1 - gauge: dataPoints: @@ -114,16 +174,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_maximum + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_maximum unit: unit1 - gauge: dataPoints: @@ -131,16 +200,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - - key: tags_tagName1 + - key: name value: - stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_count + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_count unit: unit1 - gauge: dataPoints: @@ -148,16 +223,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId3 - key: location value: stringValue: location1 - - key: tags_tagName1 + - key: metadata_dimension1 value: - stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_maximum + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric7_count unit: unit1 - gauge: dataPoints: @@ -165,16 +249,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_total + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_average unit: unit1 - gauge: dataPoints: @@ -182,10 +275,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_minimum + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: tags_tagName1 + value: + stringValue: tagValue1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_total unit: unit1 - gauge: dataPoints: @@ -193,13 +301,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_minimum + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_maximum unit: unit1 - gauge: dataPoints: @@ -207,13 +327,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_total + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_total unit: unit1 - gauge: dataPoints: @@ -221,16 +356,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_minimum + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_count unit: unit1 - gauge: dataPoints: @@ -238,10 +382,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_count + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: tags_tagName1 + value: + stringValue: tagValue1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_minimum unit: unit1 - gauge: dataPoints: @@ -249,16 +408,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - key: metadata_dimension2 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_maximum unit: unit1 - gauge: dataPoints: @@ -266,13 +437,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_count + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_total unit: unit1 - gauge: dataPoints: @@ -280,27 +463,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_minimum - unit: unit1 - - gauge: - dataPoints: - - asDouble: 1 - attributes: - - key: azuremonitor.resource_id + - key: type value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_average + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_total unit: unit1 - gauge: dataPoints: @@ -308,10 +489,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_maximum + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: tags_tagName1 + value: + stringValue: tagValue1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_count unit: unit1 - gauge: dataPoints: @@ -319,16 +515,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - key: metadata_dimension2 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_total + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_average unit: unit1 - gauge: dataPoints: @@ -336,16 +544,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_total + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_minimum unit: unit1 - gauge: dataPoints: @@ -353,16 +570,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_average + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric1_maximum unit: unit1 - gauge: dataPoints: @@ -370,13 +596,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId3 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId2 + - key: location value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654674823" - name: azure_metric7_count + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_total unit: unit1 - gauge: dataPoints: @@ -384,13 +619,28 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 - key: metadata_dimension1 value: stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654602044" - name: azure_metric6_average + - key: metadata_dimension2 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric5_count unit: unit1 - gauge: dataPoints: @@ -398,16 +648,48 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - - key: tags_tagName1 + - key: name value: - stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654622051" - name: azure_metric1_average + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_average + unit: unit1 + - gauge: + dataPoints: + - asDouble: 1 + attributes: + - key: azuremonitor.resource_id + value: + stringValue: /resourceGroups/group1/resourceId2 + - key: location + value: + stringValue: location1 + - key: metadata_dimension1 + value: + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_minimum unit: unit1 - gauge: dataPoints: @@ -415,16 +697,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId1 - key: location value: stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 - key: tags_tagName1 value: stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_minimum + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric2_maximum unit: unit1 - gauge: dataPoints: @@ -432,10 +723,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654583673" - name: azure_metric4_total + stringValue: /resourceGroups/group1/resourceId1 + - key: location + value: + stringValue: location1 + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: tags_tagName1 + value: + stringValue: tagValue1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric3_total unit: unit1 - gauge: dataPoints: @@ -443,16 +749,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId2 - - key: metadata_dimension1 + stringValue: /resourceGroups/group1/resourceId2 + - key: location value: - stringValue: dimension value - - key: metadata_dimension2 + stringValue: location1 + - key: name value: - stringValue: dimension value - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654594697" - name: azure_metric5_maximum + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_minimum unit: unit1 - gauge: dataPoints: @@ -460,16 +772,25 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - - key: tags_tagName1 + - key: metadata_dimension1 value: - stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654639679" - name: azure_metric2_average + stringValue: dimension value + - key: name + value: + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric6_count unit: unit1 - gauge: dataPoints: @@ -477,16 +798,22 @@ resourceMetrics: attributes: - key: azuremonitor.resource_id value: - stringValue: resourceId1 + stringValue: /resourceGroups/group1/resourceId2 - key: location value: stringValue: location1 - - key: tags_tagName1 + - key: name value: - stringValue: tagValue1 - startTimeUnixNano: "1681790471654481953" - timeUnixNano: "1681790471654645513" - name: azure_metric3_count + stringValue: name1 + - key: resource_group + value: + stringValue: group1 + - key: type + value: + stringValue: type1 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: azure_metric4_maximum unit: unit1 scope: name: otelcol/azuremonitorreceiver diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 964566463395..cd52604e3f35 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -39,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index c534828dc251..be95c6e11d42 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/bigipreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/bigipreceiver/testdata/expected_metrics/metrics_golden.yaml index f2f52bdff5c2..4d74caa4932b 100644 --- a/receiver/bigipreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/bigipreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -14,22 +14,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool.availability unit: "1" - description: Current number of connections to the pool. @@ -38,8 +38,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool. name: bigip.pool.data.transmitted @@ -51,15 +51,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool. @@ -70,15 +70,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool.enabled unit: "1" - description: Total number of pool members. @@ -91,15 +91,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{members}' - description: Number of packets transmitted to and from the pool. name: bigip.pool.packet.count @@ -111,15 +111,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool. @@ -128,8 +128,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: @@ -150,22 +150,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool.availability unit: "1" - description: Current number of connections to the pool. @@ -174,8 +174,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool. name: bigip.pool.data.transmitted @@ -187,15 +187,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool. @@ -206,15 +206,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool.enabled unit: "1" - description: Total number of pool members. @@ -227,15 +227,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{members}' - description: Number of packets transmitted to and from the pool. name: bigip.pool.packet.count @@ -247,15 +247,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool. @@ -264,8 +264,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: @@ -289,22 +289,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.availability unit: "1" - description: Current number of connections to the node. @@ -313,8 +313,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the node. name: bigip.node.data.transmitted @@ -326,15 +326,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the node. @@ -345,15 +345,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.enabled unit: "1" - description: Number of packets transmitted to and from the node. @@ -366,15 +366,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the node. @@ -383,8 +383,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the node. @@ -393,8 +393,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -417,22 +417,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.availability unit: "1" - description: Current number of connections to the node. @@ -441,8 +441,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the node. name: bigip.node.data.transmitted @@ -454,15 +454,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the node. @@ -473,15 +473,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.enabled unit: "1" - description: Number of packets transmitted to and from the node. @@ -494,15 +494,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the node. @@ -511,8 +511,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the node. @@ -521,8 +521,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -545,22 +545,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.availability unit: "1" - description: Current number of connections to the node. @@ -569,8 +569,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the node. name: bigip.node.data.transmitted @@ -582,15 +582,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the node. @@ -601,15 +601,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.enabled unit: "1" - description: Number of packets transmitted to and from the node. @@ -622,15 +622,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the node. @@ -639,8 +639,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the node. @@ -649,8 +649,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -673,22 +673,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.availability unit: "1" - description: Current number of connections to the node. @@ -697,8 +697,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the node. name: bigip.node.data.transmitted @@ -710,15 +710,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the node. @@ -729,15 +729,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.enabled unit: "1" - description: Number of packets transmitted to and from the node. @@ -750,15 +750,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the node. @@ -767,8 +767,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the node. @@ -777,8 +777,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -801,22 +801,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.availability unit: "1" - description: Current number of connections to the node. @@ -825,8 +825,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the node. name: bigip.node.data.transmitted @@ -838,15 +838,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the node. @@ -857,15 +857,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.node.enabled unit: "1" - description: Number of packets transmitted to and from the node. @@ -878,15 +878,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the node. @@ -895,8 +895,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the node. @@ -905,8 +905,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -932,22 +932,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -956,8 +956,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -969,15 +969,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -988,15 +988,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -1009,15 +1009,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -1026,8 +1026,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: @@ -1054,22 +1054,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -1078,8 +1078,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -1091,15 +1091,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -1110,15 +1110,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -1131,15 +1131,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -1148,8 +1148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -1158,8 +1158,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -1185,22 +1185,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -1209,8 +1209,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -1222,15 +1222,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -1241,15 +1241,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -1262,15 +1262,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -1279,8 +1279,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: @@ -1307,22 +1307,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -1331,8 +1331,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -1344,15 +1344,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -1363,15 +1363,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -1384,15 +1384,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -1401,8 +1401,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -1411,8 +1411,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -1438,22 +1438,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -1462,8 +1462,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -1475,15 +1475,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -1494,15 +1494,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -1515,15 +1515,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -1532,8 +1532,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -1542,8 +1542,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -1569,22 +1569,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -1593,8 +1593,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -1606,15 +1606,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -1625,15 +1625,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -1646,15 +1646,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -1663,8 +1663,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -1673,8 +1673,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -1700,22 +1700,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -1724,8 +1724,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -1737,15 +1737,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -1756,15 +1756,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -1777,15 +1777,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -1794,8 +1794,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -1804,8 +1804,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -1831,22 +1831,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -1855,8 +1855,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -1868,15 +1868,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -1887,15 +1887,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -1908,15 +1908,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -1925,8 +1925,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: @@ -1953,22 +1953,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -1977,8 +1977,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -1990,15 +1990,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -2009,15 +2009,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -2030,15 +2030,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -2047,8 +2047,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' scope: diff --git a/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_golden.yaml b/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_golden.yaml index 50ee1ad99533..616a8c34714d 100644 --- a/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_golden.yaml +++ b/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_golden.yaml @@ -20,19 +20,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -41,7 +41,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -53,13 +53,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -70,13 +70,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -89,13 +89,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -104,7 +104,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -131,19 +131,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -152,7 +152,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -164,13 +164,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -181,13 +181,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -200,13 +200,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -215,7 +215,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -242,19 +242,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -263,7 +263,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -275,13 +275,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -292,13 +292,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -311,13 +311,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -326,7 +326,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -353,19 +353,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -374,7 +374,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -386,13 +386,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -403,13 +403,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -422,13 +422,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -437,7 +437,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: diff --git a/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_with_members_golden.yaml b/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_with_members_golden.yaml index f7710b1fb9d0..1a3cd82a57ef 100644 --- a/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_with_members_golden.yaml +++ b/receiver/bigipreceiver/testdata/expected_metrics/metrics_partial_with_members_golden.yaml @@ -20,19 +20,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -41,7 +41,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -53,13 +53,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -70,13 +70,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -89,13 +89,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -104,7 +104,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -131,22 +131,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -155,8 +155,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -168,15 +168,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -187,15 +187,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -208,15 +208,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -235,8 +235,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -262,19 +262,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -283,7 +283,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -295,13 +295,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -312,13 +312,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -331,13 +331,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -346,7 +346,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -373,22 +373,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -397,8 +397,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -410,15 +410,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -429,15 +429,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -450,15 +450,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -467,8 +467,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -477,8 +477,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -504,22 +504,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -528,8 +528,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -541,15 +541,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -560,15 +560,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -581,15 +581,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -598,8 +598,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -608,8 +608,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -635,22 +635,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -659,8 +659,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -672,15 +672,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -691,15 +691,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -712,15 +712,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -729,8 +729,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -739,8 +739,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -766,22 +766,22 @@ resourceMetrics: - key: status value: stringValue: available - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: offline - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.availability unit: "1" - description: Current number of connections to the pool member. @@ -790,8 +790,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Amount of data transmitted to and from the pool member. name: bigip.pool_member.data.transmitted @@ -803,15 +803,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Enabled state of of the pool member. @@ -822,15 +822,15 @@ resourceMetrics: - key: status value: stringValue: disabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: bigip.pool_member.enabled unit: "1" - description: Number of packets transmitted to and from the pool member. @@ -843,15 +843,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the pool member. @@ -860,8 +860,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current number of sessions for the pool member. @@ -870,8 +870,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' scope: name: otelcol/bigipreceiver @@ -897,19 +897,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -918,7 +918,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -930,13 +930,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -947,13 +947,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -966,13 +966,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -981,7 +981,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: @@ -1008,19 +1008,19 @@ resourceMetrics: - key: status value: stringValue: available - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: offline - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: unknown - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.availability unit: "1" - description: Current number of connections to the virtual server. @@ -1029,7 +1029,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: '{connections}' - description: Amount of data transmitted to and from the virtual server. name: bigip.virtual_server.data.transmitted @@ -1041,13 +1041,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: Enabled state of of the virtual server. @@ -1058,13 +1058,13 @@ resourceMetrics: - key: status value: stringValue: disabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: enabled - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: bigip.virtual_server.enabled unit: "1" - description: Number of packets transmitted to and from the virtual server. @@ -1077,13 +1077,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{packets}' - description: Number of requests to the virtual server. @@ -1092,7 +1092,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' scope: diff --git a/receiver/collectdreceiver/collectd_test.go b/receiver/collectdreceiver/collectd_test.go index adcdb41daf44..38ac7f7f0faa 100644 --- a/receiver/collectdreceiver/collectd_test.go +++ b/receiver/collectdreceiver/collectd_test.go @@ -134,6 +134,8 @@ func assertMetricsEqual(t *testing.T, actual pmetric.Metrics) { expectedMetrics, err := golden.ReadMetrics(goldenPath) require.NoError(t, err) - err = pmetrictest.CompareMetrics(expectedMetrics, actual) + err = pmetrictest.CompareMetrics(expectedMetrics, actual, pmetrictest.IgnoreStartTimestamp(), + pmetrictest.IgnoreTimestamp(), + pmetrictest.IgnoreMetricsOrder()) require.NoError(t, err) } diff --git a/receiver/collectdreceiver/testdata/expected.yaml b/receiver/collectdreceiver/testdata/expected.yaml index 1faa4ea4a113..d2794a7ddcb5 100644 --- a/receiver/collectdreceiver/testdata/expected.yaml +++ b/receiver/collectdreceiver/testdata/expected.yaml @@ -2,179 +2,179 @@ resourceMetrics: - resource: {} scopeMetrics: - metrics: - - name: load.low - gauge: + - gauge: dataPoints: - asDouble: 0.2 - timeUnixNano: "1415062577496000000" attributes: - - key: plugin - value: - stringValue: fake - key: host value: stringValue: i-b13d1e5f - - name: load.high - gauge: - dataPoints: - - asDouble: 0.9 - timeUnixNano: "1415062577496000000" - attributes: - key: plugin value: stringValue: fake + timeUnixNano: "1000000" + name: load.low + - gauge: + dataPoints: + - asDouble: 0.9 + attributes: - key: host value: stringValue: i-b13d1e5f - - name: load.shortterm - gauge: + - key: plugin + value: + stringValue: fake + timeUnixNano: "1000000" + name: load.high + - gauge: dataPoints: - asDouble: 0.37 - timeUnixNano: "1415062577496000000" attributes: - - key: plugin - value: - stringValue: load - key: host value: stringValue: i-b13d1e5f - - name: load.midterm - gauge: - dataPoints: - - asDouble: 0.60999999999999999 - timeUnixNano: "1415062577496000000" - attributes: - key: plugin value: stringValue: load + timeUnixNano: "1000000" + name: load.shortterm + - gauge: + dataPoints: + - asDouble: 0.61 + attributes: - key: host value: stringValue: i-b13d1e5f - - name: load.longterm - gauge: - dataPoints: - - asDouble: 0.76000000000000001 - timeUnixNano: "1415062577496000000" - attributes: - key: plugin value: stringValue: load + timeUnixNano: "1000000" + name: load.midterm + - gauge: + dataPoints: + - asDouble: 0.76 + attributes: - key: host value: stringValue: i-b13d1e5f - - name: memory.used - gauge: + - key: plugin + value: + stringValue: load + timeUnixNano: "1000000" + name: load.longterm + - gauge: dataPoints: - asDouble: 1.52431e+09 - timeUnixNano: "1415062577496000000" attributes: - - key: plugin + - key: dsname value: - stringValue: memory + stringValue: value - key: host value: stringValue: i-b13d1e5f - - key: dsname + - key: plugin value: - stringValue: value + stringValue: memory + timeUnixNano: "1000000" + name: memory.used - name: df_complex.free sum: - isMonotonic: true - aggregationTemporality: 0 dataPoints: - - asDouble: 1962600000.0 - timeUnixNano: "1415062577494999808" + - asDouble: 1.9626e+09 attributes: + - key: dsname + value: + stringValue: value + - key: host + value: + stringValue: i-b13d1e5f - key: plugin value: stringValue: df - key: plugin_instance value: stringValue: dev - - key: host - value: - stringValue: i-b13d1e5f - - key: dsname - value: - stringValue: value - - name: memory.old_gen_end - gauge: + timeUnixNano: "1000000" + isMonotonic: true + - gauge: dataPoints: - - asInt: 26790 - timeUnixNano: "1434477504484000000" + - asInt: "26790" attributes: - - key: host + - key: a value: - stringValue: mwp-signalbox + stringValue: b - key: dsname value: stringValue: value - - key: plugin + - key: f value: - stringValue: tail - - key: plugin_instance + stringValue: x + - key: host value: - stringValue: analytics + stringValue: mwp-signalbox - key: k1 value: stringValue: v1 - key: k2 value: stringValue: v2 - - key: a + - key: plugin value: - stringValue: b - - key: f + stringValue: tail + - key: plugin_instance value: - stringValue: x - - name: memory.total_heap_space - gauge: + stringValue: analytics + timeUnixNano: "1000000" + name: memory.old_gen_end + - gauge: dataPoints: - asDouble: 1.03552e+06 - timeUnixNano: "1434477504484000000" attributes: - - key: host + - key: a value: - stringValue: mwp-signalbox + stringValue: b - key: dsname value: stringValue: value - - key: plugin + - key: f value: - stringValue: tail - - key: plugin_instance + stringValue: x + - key: host value: - stringValue: analytics + stringValue: mwp-signalbox - key: k1 value: stringValue: v1 - key: k2 value: stringValue: v2 - - key: a + - key: plugin value: - stringValue: b - - key: f + stringValue: tail + - key: plugin_instance value: - stringValue: x - - name: gauge.page.loadtime - gauge: + stringValue: analytics + timeUnixNano: "1000000" + name: memory.total_heap_space + - gauge: dataPoints: - asDouble: 12 - timeUnixNano: "1434477504484000000" attributes: - - key: host - value: - stringValue: some-host - key: dsname value: stringValue: value - - key: plugin - value: - stringValue: dogstatsd - key: env value: stringValue: dev + - key: host + value: + stringValue: some-host - key: k1 value: - stringValue: v1 \ No newline at end of file + stringValue: v1 + - key: plugin + value: + stringValue: dogstatsd + timeUnixNano: "1000000" + name: gauge.page.loadtime + scope: {} diff --git a/receiver/couchdbreceiver/testdata/scraper/expected.yaml b/receiver/couchdbreceiver/testdata/scraper/expected.yaml index 9af4f2bd3c07..74c5800ebdc9 100644 --- a/receiver/couchdbreceiver/testdata/scraper/expected.yaml +++ b/receiver/couchdbreceiver/testdata/scraper/expected.yaml @@ -10,8 +10,8 @@ resourceMetrics: gauge: dataPoints: - asDouble: 1 - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: couchdb.average_request_time unit: ms - description: The number of open databases. @@ -20,8 +20,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "36" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{databases}' - description: The number of database operations. name: couchdb.database.operations @@ -33,15 +33,15 @@ resourceMetrics: - key: operation value: stringValue: reads - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "39" attributes: - key: operation value: stringValue: writes - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The number of open file descriptors. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "37" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{files}' - description: The number of bulk requests. name: couchdb.httpd.bulk_requests @@ -59,8 +59,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: The number of HTTP requests by method. @@ -73,50 +73,50 @@ resourceMetrics: - key: http.method value: stringValue: COPY - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: http.method value: stringValue: DELETE - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: http.method value: stringValue: GET - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: http.method value: stringValue: HEAD - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: http.method value: stringValue: OPTIONS - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: http.method value: stringValue: POST - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: http.method value: stringValue: PUT - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: The number of each HTTP status code. @@ -129,169 +129,169 @@ resourceMetrics: - key: http.status_code value: stringValue: "200" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: http.status_code value: stringValue: "201" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: http.status_code value: stringValue: "202" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: http.status_code value: stringValue: "204" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "14" attributes: - key: http.status_code value: stringValue: "206" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "15" attributes: - key: http.status_code value: stringValue: "301" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "16" attributes: - key: http.status_code value: stringValue: "302" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "17" attributes: - key: http.status_code value: stringValue: "304" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "18" attributes: - key: http.status_code value: stringValue: "400" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: http.status_code value: stringValue: "401" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "20" attributes: - key: http.status_code value: stringValue: "403" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: http.status_code value: stringValue: "404" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "22" attributes: - key: http.status_code value: stringValue: "405" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: http.status_code value: stringValue: "406" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "24" attributes: - key: http.status_code value: stringValue: "409" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25" attributes: - key: http.status_code value: stringValue: "412" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26" attributes: - key: http.status_code value: stringValue: "413" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "27" attributes: - key: http.status_code value: stringValue: "414" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28" attributes: - key: http.status_code value: stringValue: "415" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "29" attributes: - key: http.status_code value: stringValue: "416" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: http.status_code value: stringValue: "417" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "31" attributes: - key: http.status_code value: stringValue: "500" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: http.status_code value: stringValue: "501" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: http.status_code value: stringValue: "503" - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: The number of views read. @@ -304,15 +304,15 @@ resourceMetrics: - key: view value: stringValue: temporary_view_reads - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "35" attributes: - key: view value: stringValue: view_reads - startTimeUnixNano: "1642435850241561000" - timeUnixNano: "1642435850241610000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{views}' scope: diff --git a/receiver/couchdbreceiver/testdata/scraper/only_db_ops.yaml b/receiver/couchdbreceiver/testdata/scraper/only_db_ops.yaml index d4be60a7dfbd..3d0a439aaaae 100644 --- a/receiver/couchdbreceiver/testdata/scraper/only_db_ops.yaml +++ b/receiver/couchdbreceiver/testdata/scraper/only_db_ops.yaml @@ -16,15 +16,15 @@ resourceMetrics: - key: operation value: stringValue: reads - startTimeUnixNano: "1651674345801839000" - timeUnixNano: "1651674345801933000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "39" attributes: - key: operation value: stringValue: writes - startTimeUnixNano: "1651674345801839000" - timeUnixNano: "1651674345801933000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' scope: diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 1de332e26c5d..7e995beaf4ff 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -37,7 +37,7 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index f417e0649374..e4dec9f617d3 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -139,8 +139,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml index 23b240087693..c4a3d1246f03 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml @@ -35,8 +35,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -48,16 +48,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0.041326615629205886 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -66,8 +66,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -76,8 +76,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -86,8 +86,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -96,8 +96,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "970974000" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -106,8 +106,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4836970000000" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -116,8 +116,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "999478000" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -126,8 +126,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28503000" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -136,8 +136,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -145,8 +145,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Amount of memory used in anonymous mappings such as brk(), sbrk(), and mmap(MAP_ANONYMOUS) (Only available with cgroups v2). name: container.memory.anon @@ -154,8 +154,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "61440" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Amount of memory used to cache filesystem data, including tmpfs and shared memory (Only available with cgroups v2). name: container.memory.file @@ -163,8 +163,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "233848832" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -172,8 +172,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "233906176" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -181,15 +181,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 87.41302490234375 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -198,8 +198,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9458" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -208,8 +208,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: The amount of memory that cannot be reclaimed. @@ -218,8 +218,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -227,8 +227,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "268435456" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -236,8 +236,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -245,8 +245,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "234647552" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -258,8 +258,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -272,8 +272,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -286,8 +286,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -300,8 +300,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -314,8 +314,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -328,8 +328,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -342,8 +342,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -356,8 +356,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -366,8 +366,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Maximum number of pids in the container's cgroup. name: container.pids.limit @@ -375,15 +375,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4694" - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 5.343272557349942e+06 - startTimeUnixNano: "1687762436307743000" - timeUnixNano: "1687762436315926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml index c3301e58ef4a..dcfe6bc744e5 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml @@ -41,8 +41,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -54,8 +54,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -67,8 +67,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -80,8 +80,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -93,8 +93,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -106,8 +106,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1). @@ -126,8 +126,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -139,8 +139,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -152,8 +152,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -165,8 +165,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -178,8 +178,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -191,16 +191,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0.0002888012543185477 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -209,8 +209,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -219,8 +219,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -229,8 +229,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -239,8 +239,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Per-core CPU usage by the container (Only available with cgroups v1). @@ -253,57 +253,57 @@ resourceMetrics: - key: core value: stringValue: cpu0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: core value: stringValue: cpu1 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "262690" attributes: - key: core value: stringValue: cpu2 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "762532" attributes: - key: core value: stringValue: cpu3 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "78532" attributes: - key: core value: stringValue: cpu4 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28108575" attributes: - key: core value: stringValue: cpu5 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8800811" attributes: - key: core value: stringValue: cpu6 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4191833" attributes: - key: core value: stringValue: cpu7 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -312,8 +312,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "120830550000000" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -322,8 +322,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "43620018" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -332,8 +332,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -351,8 +351,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1). name: container.memory.cache @@ -360,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1). name: container.memory.dirty @@ -369,8 +369,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memory_limit @@ -378,8 +378,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memsw_limit @@ -387,8 +387,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -396,8 +396,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -405,8 +405,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1). name: container.memory.mapped_file @@ -414,15 +414,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.006938014912420301 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -431,8 +431,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -441,8 +441,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup (Only available with cgroups v1). @@ -451,8 +451,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup (Only available with cgroups v1). @@ -461,8 +461,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1).' @@ -471,8 +471,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1). name: container.memory.rss_huge @@ -480,8 +480,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_anon @@ -489,8 +489,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_file @@ -498,8 +498,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1). name: container.memory.total_cache @@ -507,8 +507,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_dirty @@ -516,8 +516,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_anon @@ -525,8 +525,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_file @@ -534,8 +534,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1). name: container.memory.total_mapped_file @@ -543,8 +543,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1). name: container.memory.total_pgfault @@ -552,8 +552,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1). @@ -562,8 +562,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -572,8 +572,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -582,8 +582,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1).' @@ -592,8 +592,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1). name: container.memory.total_rss_huge @@ -601,8 +601,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_unevictable @@ -610,8 +610,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_writeback @@ -619,8 +619,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. name: container.memory.unevictable @@ -628,8 +628,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -637,8 +637,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10449559552" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -646,8 +646,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3932160" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -655,8 +655,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "724992" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1). name: container.memory.writeback @@ -664,8 +664,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -677,8 +677,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -691,8 +691,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -705,8 +705,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -719,8 +719,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -733,8 +733,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -747,8 +747,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -761,8 +761,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -775,16 +775,16 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 3.06813859730868e+07 - startTimeUnixNano: "1687762436220246000" - timeUnixNano: "1687762436230155000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml index 391eab8088a4..e76e6fe22bb2 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml @@ -35,8 +35,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -48,8 +48,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1998848" attributes: - key: device_major @@ -61,8 +61,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -74,8 +74,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1998848" attributes: - key: device_major @@ -87,8 +87,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -100,16 +100,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -118,8 +118,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -128,8 +128,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -138,8 +138,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -148,8 +148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5467000" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -158,8 +158,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "183556380000000" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -168,8 +168,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10935000" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -178,8 +178,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5467000" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -188,8 +188,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -197,8 +197,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Amount of memory used in anonymous mappings such as brk(), sbrk(), and mmap(MAP_ANONYMOUS) (Only available with cgroups v2). name: container.memory.anon @@ -206,8 +206,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "114688" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Amount of memory used to cache filesystem data, including tmpfs and shared memory (Only available with cgroups v2). name: container.memory.file @@ -215,8 +215,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1892352" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -224,8 +224,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "110592" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -233,15 +233,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1892352" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.016875995187363255 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -250,8 +250,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1029" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -260,8 +260,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: The amount of memory that cannot be reclaimed. @@ -270,8 +270,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -279,8 +279,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2063048704" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -288,8 +288,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -297,8 +297,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "348160" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -310,8 +310,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -324,8 +324,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -338,8 +338,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -352,8 +352,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -366,8 +366,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -380,8 +380,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -394,8 +394,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -408,8 +408,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -418,8 +418,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Maximum number of pids in the container's cgroup. name: container.pids.limit @@ -427,15 +427,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2192" - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 5.849208473080516e+06 - startTimeUnixNano: "1687762436274253000" - timeUnixNano: "1687762436282542000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml index e2398e45c2ff..c9343ed9b1a0 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml @@ -47,8 +47,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -60,8 +60,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -73,8 +73,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -86,8 +86,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -99,8 +99,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -112,8 +112,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1). @@ -132,8 +132,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -145,8 +145,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -158,8 +158,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -171,8 +171,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -184,8 +184,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -197,16 +197,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0.0002888012543185477 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -215,8 +215,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -235,8 +235,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -245,8 +245,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Per-core CPU usage by the container (Only available with cgroups v1). @@ -259,57 +259,57 @@ resourceMetrics: - key: core value: stringValue: cpu0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: core value: stringValue: cpu1 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "262690" attributes: - key: core value: stringValue: cpu2 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "762532" attributes: - key: core value: stringValue: cpu3 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "78532" attributes: - key: core value: stringValue: cpu4 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28108575" attributes: - key: core value: stringValue: cpu5 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8800811" attributes: - key: core value: stringValue: cpu6 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4191833" attributes: - key: core value: stringValue: cpu7 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -318,8 +318,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "120830550000000" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -328,8 +328,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "43620018" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -338,8 +338,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -348,8 +348,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -357,8 +357,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1). name: container.memory.cache @@ -366,8 +366,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1). name: container.memory.dirty @@ -375,8 +375,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memory_limit @@ -384,8 +384,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memsw_limit @@ -393,8 +393,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -402,8 +402,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -411,8 +411,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1). name: container.memory.mapped_file @@ -420,15 +420,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.006938014912420301 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -437,8 +437,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -447,8 +447,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup (Only available with cgroups v1). @@ -457,8 +457,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup (Only available with cgroups v1). @@ -467,8 +467,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1).' @@ -477,8 +477,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1). name: container.memory.rss_huge @@ -486,8 +486,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_anon @@ -495,8 +495,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_file @@ -504,8 +504,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1). name: container.memory.total_cache @@ -513,8 +513,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_dirty @@ -522,8 +522,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_anon @@ -531,8 +531,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_file @@ -540,8 +540,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1). name: container.memory.total_mapped_file @@ -549,8 +549,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1). name: container.memory.total_pgfault @@ -558,8 +558,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1). @@ -568,8 +568,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -578,8 +578,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -588,8 +588,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1).' @@ -598,8 +598,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1). name: container.memory.total_rss_huge @@ -607,8 +607,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_unevictable @@ -616,8 +616,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_writeback @@ -625,8 +625,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. name: container.memory.unevictable @@ -634,8 +634,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -643,8 +643,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10449559552" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -652,8 +652,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3932160" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -661,8 +661,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "724992" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1). name: container.memory.writeback @@ -670,8 +670,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -683,8 +683,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -697,8 +697,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -711,8 +711,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -725,8 +725,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -739,8 +739,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -753,8 +753,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -767,8 +767,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -781,8 +781,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -791,15 +791,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 3.06813858144158e+07 - startTimeUnixNano: "1687762436059456000" - timeUnixNano: "1687762436071484000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml index 9a841727892d..c681d1437dda 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml @@ -47,8 +47,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -60,8 +60,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -73,8 +73,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -86,8 +86,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2502656" attributes: - key: device_major @@ -99,8 +99,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -112,8 +112,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1). @@ -132,8 +132,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -145,8 +145,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -158,8 +158,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -171,8 +171,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "99" attributes: - key: device_major @@ -184,8 +184,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -197,16 +197,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0.0002888012543185477 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -215,8 +215,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -235,8 +235,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -245,8 +245,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Per-core CPU usage by the container (Only available with cgroups v1). @@ -259,57 +259,57 @@ resourceMetrics: - key: core value: stringValue: cpu0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: core value: stringValue: cpu1 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "262690" attributes: - key: core value: stringValue: cpu2 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "762532" attributes: - key: core value: stringValue: cpu3 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "78532" attributes: - key: core value: stringValue: cpu4 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28108575" attributes: - key: core value: stringValue: cpu5 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8800811" attributes: - key: core value: stringValue: cpu6 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4191833" attributes: - key: core value: stringValue: cpu7 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -318,8 +318,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "120830550000000" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -328,8 +328,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "43620018" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -338,8 +338,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -348,8 +348,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -357,8 +357,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1). name: container.memory.cache @@ -366,8 +366,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1). name: container.memory.dirty @@ -375,8 +375,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memory_limit @@ -384,8 +384,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memsw_limit @@ -393,8 +393,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -402,8 +402,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -411,8 +411,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1). name: container.memory.mapped_file @@ -420,15 +420,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.006938014912420301 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -437,8 +437,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -447,8 +447,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup (Only available with cgroups v1). @@ -457,8 +457,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup (Only available with cgroups v1). @@ -467,8 +467,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1).' @@ -477,8 +477,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1). name: container.memory.rss_huge @@ -486,8 +486,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_anon @@ -495,8 +495,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_file @@ -504,8 +504,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270336" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1). name: container.memory.total_cache @@ -513,8 +513,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2433024" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_dirty @@ -522,8 +522,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_anon @@ -531,8 +531,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_file @@ -540,8 +540,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2162688" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1). name: container.memory.total_mapped_file @@ -549,8 +549,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1486848" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1). name: container.memory.total_pgfault @@ -558,8 +558,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "990" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1). @@ -568,8 +568,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -578,8 +578,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1287" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -588,8 +588,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "667" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1).' @@ -598,8 +598,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1). name: container.memory.total_rss_huge @@ -607,8 +607,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_unevictable @@ -616,8 +616,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_writeback @@ -625,8 +625,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. name: container.memory.unevictable @@ -634,8 +634,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -643,8 +643,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10449559552" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -652,8 +652,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3932160" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -661,8 +661,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "724992" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1). name: container.memory.writeback @@ -670,8 +670,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -683,8 +683,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -697,8 +697,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -711,8 +711,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -725,8 +725,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -739,8 +739,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -753,8 +753,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -767,8 +767,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -781,8 +781,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -791,15 +791,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 3.06813860885448e+07 - startTimeUnixNano: "1687762436337809000" - timeUnixNano: "1687762436345613000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml index 94f7415657c7..5163742d1d56 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml @@ -41,8 +41,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -54,8 +54,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "73728" attributes: - key: device_major @@ -67,8 +67,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "73728" attributes: - key: device_major @@ -80,8 +80,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "73728" attributes: - key: device_major @@ -93,8 +93,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -106,8 +106,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1). @@ -126,8 +126,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -139,8 +139,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: device_major @@ -152,8 +152,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: device_major @@ -165,8 +165,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: device_major @@ -178,8 +178,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -191,16 +191,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -209,8 +209,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -219,8 +219,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -229,8 +229,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -239,8 +239,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Per-core CPU usage by the container (Only available with cgroups v1). @@ -253,8 +253,8 @@ resourceMetrics: - key: core value: stringValue: cpu0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -263,8 +263,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14930240000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -273,8 +273,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "31093384" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -283,8 +283,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -293,8 +293,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -302,8 +302,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "73728" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1). name: container.memory.cache @@ -311,8 +311,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "73728" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1). name: container.memory.dirty @@ -320,8 +320,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memory_limit @@ -329,8 +329,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memsw_limit @@ -338,8 +338,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -347,8 +347,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "106496" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -356,8 +356,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1). name: container.memory.mapped_file @@ -365,15 +365,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.02053846320949035 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -382,8 +382,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2417" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -392,8 +392,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup (Only available with cgroups v1). @@ -402,8 +402,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1980" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup (Only available with cgroups v1). @@ -412,8 +412,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1935" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1).' @@ -422,8 +422,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "110592" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1). name: container.memory.rss_huge @@ -431,8 +431,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_anon @@ -440,8 +440,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_file @@ -449,8 +449,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "73728" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1). name: container.memory.total_cache @@ -458,8 +458,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "73728" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_dirty @@ -467,8 +467,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_anon @@ -476,8 +476,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "106496" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_file @@ -485,8 +485,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1). name: container.memory.total_mapped_file @@ -494,8 +494,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1). name: container.memory.total_pgfault @@ -503,8 +503,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2417" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1). @@ -513,8 +513,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -523,8 +523,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1980" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -533,8 +533,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1935" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1).' @@ -543,8 +543,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "110592" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1). name: container.memory.total_rss_huge @@ -552,8 +552,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_unevictable @@ -561,8 +561,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_writeback @@ -570,8 +570,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. name: container.memory.unevictable @@ -579,8 +579,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -588,8 +588,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2074079232" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -597,8 +597,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6172672" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -606,8 +606,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "425984" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1). name: container.memory.writeback @@ -615,8 +615,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -628,8 +628,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -642,8 +642,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -656,8 +656,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -670,8 +670,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -684,8 +684,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -698,8 +698,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -712,8 +712,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -726,8 +726,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -736,15 +736,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 3.017587092456784e+07 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: @@ -792,8 +792,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -805,8 +805,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1187840" attributes: - key: device_major @@ -818,8 +818,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1187840" attributes: - key: device_major @@ -831,8 +831,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1187840" attributes: - key: device_major @@ -844,8 +844,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -857,8 +857,8 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of IOs (bio) issued to the disk by the group and descendant groups (Only available with cgroups v1). @@ -877,8 +877,8 @@ resourceMetrics: - key: operation value: stringValue: async - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -890,8 +890,8 @@ resourceMetrics: - key: operation value: stringValue: discard - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: device_major @@ -903,8 +903,8 @@ resourceMetrics: - key: operation value: stringValue: read - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: device_major @@ -916,8 +916,8 @@ resourceMetrics: - key: operation value: stringValue: sync - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: device_major @@ -929,8 +929,8 @@ resourceMetrics: - key: operation value: stringValue: total - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: device_major @@ -942,16 +942,16 @@ resourceMetrics: - key: operation value: stringValue: write - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'Deprecated: use `container.cpu.utilization` metric instead. Percent of CPU used by the container.' gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.cpu.percent unit: "1" - description: Number of periods with throttling active. @@ -960,8 +960,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Number of periods when the container hits its throttling limit. @@ -970,8 +970,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{periods}' - description: Aggregate time the container was throttled. @@ -980,8 +980,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in kernel mode (Linux). Time spent by all container processes in kernel mode (Windows). @@ -990,8 +990,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Per-core CPU usage by the container (Only available with cgroups v1). @@ -1004,8 +1004,8 @@ resourceMetrics: - key: core value: stringValue: cpu0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: System CPU usage, as reported by docker. @@ -1014,8 +1014,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14834790000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Total CPU time consumed. @@ -1024,8 +1024,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "34117917" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: Time spent by tasks of the cgroup in user mode (Linux). Time spent by all container processes in user mode (Windows). @@ -1034,8 +1034,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10000000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The amount of anonymous memory that has been identified as active by the kernel. @@ -1044,8 +1044,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. name: container.memory.active_file @@ -1053,8 +1053,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "393216" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the processes of this control group that can be associated precisely with a block on a block device (Only available with cgroups v1). name: container.memory.cache @@ -1062,8 +1062,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "921600" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup (Only available with cgroups v1). name: container.memory.dirty @@ -1071,8 +1071,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of physical memory that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memory_limit @@ -1080,8 +1080,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of RAM + swap that can be used by the processes of this control group (Only available with cgroups v1). name: container.memory.hierarchical_memsw_limit @@ -1089,8 +1089,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9223372036854772000" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. name: container.memory.inactive_anon @@ -1098,8 +1098,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "147456" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. name: container.memory.inactive_file @@ -1107,8 +1107,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "528384" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group (Only available with cgroups v1). name: container.memory.mapped_file @@ -1116,15 +1116,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "843776" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Percentage of memory used. gauge: dataPoints: - asDouble: 0.037324707178785346 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.memory.percent unit: "1" - description: Indicate the number of times that a process of the cgroup triggered a page fault. @@ -1133,8 +1133,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2469" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup triggered a major fault. @@ -1143,8 +1143,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup (Only available with cgroups v1). @@ -1153,8 +1153,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2288" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup (Only available with cgroups v1). @@ -1163,8 +1163,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2026" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps (Only available with cgroups v1).' @@ -1173,8 +1173,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "151552" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup (Only available with cgroups v1). name: container.memory.rss_huge @@ -1182,8 +1182,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_anon @@ -1191,8 +1191,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4096" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as active by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_active_file @@ -1200,8 +1200,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "393216" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used by the processes of this cgroup (and descendants) that can be associated with a block on a block device. Also accounts for memory used by tmpfs (Only available with cgroups v1). name: container.memory.total_cache @@ -1209,8 +1209,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "921600" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes that are waiting to get written back to the disk, from this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_dirty @@ -1218,8 +1218,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of anonymous memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_anon @@ -1227,8 +1227,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "147456" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cache memory that has been identified as inactive by the kernel. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_inactive_file @@ -1236,8 +1236,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "528384" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicates the amount of memory mapped by the processes in the control group and descendant groups (Only available with cgroups v1). name: container.memory.total_mapped_file @@ -1245,8 +1245,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "843776" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a page fault (Only available with cgroups v1). name: container.memory.total_pgfault @@ -1254,8 +1254,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2469" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Indicate the number of times that a process of the cgroup (or descendant cgroups) triggered a major fault (Only available with cgroups v1). @@ -1264,8 +1264,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{faults}' - description: Number of pages read from disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -1274,8 +1274,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2288" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of pages written to disk by the cgroup and descendant groups (Only available with cgroups v1). @@ -1284,8 +1284,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2026" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: 'The amount of memory that doesn’t correspond to anything on disk: stacks, heaps, and anonymous memory maps. Includes descendant cgroups (Only available with cgroups v1).' @@ -1294,8 +1294,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "151552" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of anonymous transparent hugepages in this cgroup and descendant cgroups (Only available with cgroups v1). name: container.memory.total_rss_huge @@ -1303,8 +1303,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. Includes descendant cgroups (Only available with cgroups v1). name: container.memory.total_unevictable @@ -1312,8 +1312,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup and descendants (Only available with cgroups v1). name: container.memory.total_writeback @@ -1321,8 +1321,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory that cannot be reclaimed. name: container.memory.unevictable @@ -1330,8 +1330,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory limit of the container. name: container.memory.usage.limit @@ -1339,8 +1339,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2074079232" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum memory usage. name: container.memory.usage.max @@ -1348,8 +1348,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6201344" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Memory usage of the container. This excludes the cache. name: container.memory.usage.total @@ -1357,8 +1357,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "774144" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of bytes of file/anon cache that are queued for syncing to disk in this cgroup (Only available with cgroups v1). name: container.memory.writeback @@ -1366,8 +1366,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes received by the container. name: container.network.io.usage.rx_bytes @@ -1379,8 +1379,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Incoming packets dropped. @@ -1393,8 +1393,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Received errors. @@ -1407,8 +1407,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets received. @@ -1421,8 +1421,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Bytes sent. @@ -1435,8 +1435,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Outgoing packets dropped. @@ -1449,8 +1449,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Sent errors. @@ -1463,8 +1463,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Packets sent. @@ -1477,8 +1477,8 @@ resourceMetrics: - key: interface value: stringValue: eth0 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of pids in the container's cgroup. @@ -1487,15 +1487,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{pids}' - description: Time elapsed since container start time. gauge: dataPoints: - asDouble: 3.0175814949953232e+07 - startTimeUnixNano: "1687762436124732000" - timeUnixNano: "1687762436137493000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: container.uptime unit: s scope: diff --git a/receiver/elasticsearchreceiver/README.md b/receiver/elasticsearchreceiver/README.md index bbe178ebb355..40450623e6b3 100644 --- a/receiver/elasticsearchreceiver/README.md +++ b/receiver/elasticsearchreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [beta]: metrics | | Distributions | [contrib], [observiq], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Felasticsearch%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Felasticsearch) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Felasticsearch%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Felasticsearch) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@binaryfissiongames](https://www.github.com/binaryfissiongames) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@BinaryFissionGames](https://www.github.com/BinaryFissionGames) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 0daa46de2bbc..b7c33750c159 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -42,7 +42,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 0d469e3e413d..0018fd434b83 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/elasticsearchreceiver/metadata.yaml b/receiver/elasticsearchreceiver/metadata.yaml index d4544c4019cf..01ebcd18e4c3 100644 --- a/receiver/elasticsearchreceiver/metadata.yaml +++ b/receiver/elasticsearchreceiver/metadata.yaml @@ -6,7 +6,7 @@ status: beta: [metrics] distributions: [contrib, observiq, sumo] codeowners: - active: [djaglowski, binaryfissiongames] + active: [djaglowski, BinaryFissionGames] resource_attributes: elasticsearch.cluster.name: diff --git a/receiver/elasticsearchreceiver/testdata/expected_metrics/clusterSkip.yaml b/receiver/elasticsearchreceiver/testdata/expected_metrics/clusterSkip.yaml index 05934cbec08f..c43c890d7cc9 100644 --- a/receiver/elasticsearchreceiver/testdata/expected_metrics/clusterSkip.yaml +++ b/receiver/elasticsearchreceiver/testdata/expected_metrics/clusterSkip.yaml @@ -22,8 +22,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -32,8 +32,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -42,8 +42,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -52,8 +52,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -62,8 +62,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -72,8 +72,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -82,8 +82,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -92,8 +92,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -102,8 +102,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -112,8 +112,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -122,8 +122,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -132,8 +132,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -142,8 +142,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -152,8 +152,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -162,8 +162,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -172,8 +172,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -182,8 +182,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -192,8 +192,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -202,8 +202,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -212,8 +212,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -222,8 +222,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -232,8 +232,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Time spent on operations for an index. @@ -249,8 +249,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -259,8 +259,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -269,8 +269,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -279,8 +279,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -289,8 +289,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -299,8 +299,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -309,8 +309,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -319,8 +319,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -329,8 +329,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -339,8 +339,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -349,8 +349,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -359,8 +359,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -369,8 +369,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -379,8 +379,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -389,8 +389,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -399,8 +399,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -409,8 +409,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -419,8 +419,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -429,8 +429,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -439,8 +439,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -449,8 +449,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -459,8 +459,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The size of the shards assigned to this index. @@ -473,8 +473,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver @@ -502,8 +502,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -512,8 +512,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -522,8 +522,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -532,8 +532,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -542,8 +542,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -552,8 +552,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -562,8 +562,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -572,8 +572,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -582,8 +582,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -592,8 +592,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -602,8 +602,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -612,8 +612,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -622,8 +622,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -632,8 +632,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -642,8 +642,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -652,8 +652,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -662,8 +662,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -672,8 +672,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -682,8 +682,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -692,8 +692,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -702,8 +702,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -712,8 +712,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Time spent on operations for an index. @@ -729,8 +729,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -739,8 +739,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -749,8 +749,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -759,8 +759,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -769,8 +769,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -779,8 +779,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -789,8 +789,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -799,8 +799,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -809,8 +809,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -819,8 +819,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -829,8 +829,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -839,8 +839,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -849,8 +849,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -859,8 +859,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -869,8 +869,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -879,8 +879,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -889,8 +889,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -899,8 +899,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -909,8 +909,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -919,8 +919,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -929,8 +929,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -939,8 +939,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The size of the shards assigned to this index. @@ -953,8 +953,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver @@ -980,43 +980,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "305152000" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.breaker.memory.estimated unit: By - description: Memory limit for the circuit breaker. @@ -1029,43 +1029,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "214748364" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "536870912" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "268435456" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "510027366" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "322122547" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total number of times the circuit breaker has been triggered and prevented an out of memory error. name: elasticsearch.breaker.tripped @@ -1077,43 +1077,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of differences between published cluster states. @@ -1126,15 +1126,15 @@ resourceMetrics: - key: state value: stringValue: compatible - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: incompatible - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Number of published cluster states. name: elasticsearch.cluster.published_states.full @@ -1142,8 +1142,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Number of cluster states in queue. name: elasticsearch.cluster.state_queue @@ -1155,15 +1155,15 @@ resourceMetrics: - key: state value: stringValue: committed - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: pending - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of cluster state update attempts that changed the cluster state since the node started. name: elasticsearch.cluster.state_update.count @@ -1175,22 +1175,22 @@ resourceMetrics: - key: state value: stringValue: failure - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state value: stringValue: success - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: state value: stringValue: unchanged - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The cumulative amount of time updating the cluster state since the node started. @@ -1206,8 +1206,8 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1216,8 +1216,8 @@ resourceMetrics: - key: type value: stringValue: completion - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1226,8 +1226,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1236,8 +1236,8 @@ resourceMetrics: - key: type value: stringValue: context_construction - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1246,8 +1246,8 @@ resourceMetrics: - key: type value: stringValue: master_apply - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1256,8 +1256,8 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "113" attributes: - key: state @@ -1266,8 +1266,8 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "117" attributes: - key: state @@ -1276,8 +1276,8 @@ resourceMetrics: - key: type value: stringValue: completion - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: state @@ -1286,8 +1286,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "17" attributes: - key: state @@ -1296,8 +1296,8 @@ resourceMetrics: - key: type value: stringValue: context_construction - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "484" attributes: - key: state @@ -1306,8 +1306,8 @@ resourceMetrics: - key: type value: stringValue: master_apply - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: state @@ -1316,8 +1316,8 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state @@ -1326,8 +1326,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state @@ -1336,16 +1336,16 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Configured memory limit, in bytes, for the indexing requests. gauge: dataPoints: - asInt: "53687091" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.indexing_pressure.memory.limit unit: By - description: Cumulative number of indexing requests rejected in the primary stage. @@ -1354,8 +1354,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of indexing requests rejected in the replica stage. @@ -1364,8 +1364,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Memory consumed, in bytes, by indexing requests in the specified stage. @@ -1378,22 +1378,22 @@ resourceMetrics: - key: stage value: stringValue: coordinating - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: stage value: stringValue: primary - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: stage value: stringValue: replica - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total count of query cache misses across all shards assigned to selected nodes. name: elasticsearch.node.cache.count @@ -1405,15 +1405,15 @@ resourceMetrics: - key: type value: stringValue: hit - startTimeUnixNano: "1662952760849369000" - timeUnixNano: "1662952760851518000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5324" attributes: - key: type value: stringValue: miss - startTimeUnixNano: "1662952760849369000" - timeUnixNano: "1662952760851518000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{count}' - description: The number of evictions from the cache on a node. name: elasticsearch.node.cache.evictions @@ -1425,15 +1425,15 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{evictions}' - description: The size in bytes of the cache on a node. @@ -1446,15 +1446,15 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "394" attributes: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of open tcp connections for internal cluster communication. name: elasticsearch.node.cluster.connections @@ -1462,8 +1462,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "100" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: The number of bytes sent and received on the network for internal cluster communication. name: elasticsearch.node.cluster.io @@ -1475,15 +1475,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "157732" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The total number of kilobytes read across all file stores for this node. @@ -1492,8 +1492,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1617780" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The total number of kilobytes written across all file stores for this node. name: elasticsearch.node.disk.io.write @@ -1501,8 +1501,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "602016" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The number of documents on the node. name: elasticsearch.node.documents @@ -1514,15 +1514,15 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "200" attributes: - key: state value: stringValue: deleted - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: The amount of disk space available to the JVM across all file stores for this node. Depending on OS or process level restrictions, this might appear less than free. This is the actual amount of free disk space the Elasticsearch node can utilise. name: elasticsearch.node.fs.disk.available @@ -1530,8 +1530,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12293464064" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of unallocated disk space across all file stores for this node. name: elasticsearch.node.fs.disk.free @@ -1539,8 +1539,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15746158592" - startTimeUnixNano: "1642218266053041000" - timeUnixNano: "1642218266053039000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of disk space across all file stores for this node. name: elasticsearch.node.fs.disk.total @@ -1548,8 +1548,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67371577344" - startTimeUnixNano: "1642218266053041000" - timeUnixNano: "1642218266053039000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of HTTP connections to the node. name: elasticsearch.node.http.connections @@ -1557,8 +1557,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Total number of documents ingested during the lifetime of this node. name: elasticsearch.node.ingest.documents @@ -1566,8 +1566,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{documents}' - description: Total number of documents currently being ingested. @@ -1576,8 +1576,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Total number of failed ingest operations during the lifetime of this node. name: elasticsearch.node.ingest.operations.failed @@ -1585,8 +1585,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' - description: The number of open file descriptors held by the node. @@ -1595,8 +1595,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{files}' - description: The number of operations completed by a node. name: elasticsearch.node.operations.completed @@ -1608,78 +1608,78 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "234" attributes: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "345" attributes: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "600" attributes: - key: operation value: stringValue: get - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "200" attributes: - key: operation value: stringValue: index - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "124" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "958" attributes: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "235" attributes: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Time spent on operations by a node. @@ -1692,78 +1692,78 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "256" attributes: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "995" attributes: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "500" attributes: - key: operation value: stringValue: get - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "300" attributes: - key: operation value: stringValue: index - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25345" attributes: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2354" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "544" attributes: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2342" attributes: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "664" attributes: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Total number of documents currently being ingested by a pipeline. @@ -1776,15 +1776,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Number of documents preprocessed by the ingest pipeline. name: elasticsearch.node.pipeline.ingest.documents.preprocessed @@ -1796,15 +1796,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Total number of failed operations for the ingest pipeline. name: elasticsearch.node.pipeline.ingest.operations.failed @@ -1816,15 +1816,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' - description: Total number of times the script cache has evicted old data. @@ -1833,8 +1833,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Total number of times the script compilation circuit breaker has limited inline script compilations. @@ -1843,8 +1843,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Total number of inline script compilations performed by the node. @@ -1853,8 +1853,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{compilations}' - description: Total data set size of all shards assigned to the node. This includes the size of shards not stored fully on the node, such as the cache for partially mounted indices. name: elasticsearch.node.shards.data_set.size @@ -1862,8 +1862,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: A prediction of how much larger the shard stores on this node will eventually grow due to ongoing peer recoveries, restoring snapshots, and similar activities. A value of -1 indicates that this is not available. name: elasticsearch.node.shards.reserved.size @@ -1871,8 +1871,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The size of the shards assigned to this node. name: elasticsearch.node.shards.size @@ -1880,8 +1880,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "300" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of tasks finished by the thread pool. name: elasticsearch.node.thread_pool.tasks.finished @@ -1896,8 +1896,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: state @@ -1906,8 +1906,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{tasks}' - description: The number of queued tasks in the thread pool. @@ -1920,8 +1920,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{tasks}' - description: The number of threads in the thread pool. name: elasticsearch.node.thread_pool.threads @@ -1936,8 +1936,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "-2" attributes: - key: state @@ -1946,8 +1946,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: Number of transaction log operations. name: elasticsearch.node.translog.operations @@ -1955,8 +1955,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Size of the transaction log. @@ -1965,8 +1965,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Size of uncommitted transaction log operations. name: elasticsearch.node.translog.uncommitted.size @@ -1974,39 +1974,39 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Fifteen-minute load average on the system (field is not present if fifteen-minute load average is not available). gauge: dataPoints: - asDouble: 0.02 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.15m unit: "1" - description: One-minute load average on the system (field is not present if one-minute load average is not available). gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.1m unit: "1" - description: Five-minute load average on the system (field is not present if five-minute load average is not available). gauge: dataPoints: - asDouble: 0.02 - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.5m unit: "1" - description: Recent CPU usage for the whole system, or -1 if not supported. gauge: dataPoints: - asInt: "3" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.usage unit: '%' - description: Amount of physical memory. @@ -2017,23 +2017,23 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "779632640" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.memory unit: By - description: The number of loaded classes gauge: dataPoints: - asInt: "20695" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.classes.loaded unit: "1" - description: The total number of garbage collections that have occurred @@ -2046,15 +2046,15 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "20" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The approximate accumulated collection elapsed time @@ -2067,55 +2067,55 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "930" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The amount of memory that is guaranteed to be available for the heap gauge: dataPoints: - asInt: "536870912" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.committed unit: By - description: The maximum amount of memory can be used for the heap gauge: dataPoints: - asInt: "536870912" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.max unit: By - description: The current heap memory usage gauge: dataPoints: - asInt: "305152000" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.used unit: By - description: The amount of memory that is guaranteed to be available for non-heap purposes gauge: dataPoints: - asInt: "131792896" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.nonheap.committed unit: By - description: The current non-heap memory usage gauge: dataPoints: - asInt: "128825192" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.nonheap.used unit: By - description: The maximum amount of memory can be used for the memory pool @@ -2126,22 +2126,22 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "736870912" attributes: - key: name value: stringValue: survivor - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "636870912" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.pool.max unit: By - description: The current memory pool memory usage @@ -2152,30 +2152,30 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10485760" attributes: - key: name value: stringValue: survivor - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "218103808" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.pool.used unit: By - description: The current number of threads gauge: dataPoints: - asInt: "27" - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.threads.count unit: "1" scope: diff --git a/receiver/elasticsearchreceiver/testdata/expected_metrics/full.yaml b/receiver/elasticsearchreceiver/testdata/expected_metrics/full.yaml index a4e98867c499..97af08fca79a 100644 --- a/receiver/elasticsearchreceiver/testdata/expected_metrics/full.yaml +++ b/receiver/elasticsearchreceiver/testdata/expected_metrics/full.yaml @@ -12,8 +12,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: The health status of the cluster. name: elasticsearch.cluster.health @@ -25,22 +25,22 @@ resourceMetrics: - key: status value: stringValue: green - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: red - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: yellow - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{status}' - description: The number of unfinished fetches. name: elasticsearch.cluster.in_flight_fetch @@ -48,8 +48,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1662457988667492000" - timeUnixNano: "1662457988669427000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{fetches}' - description: The number of evictions from the cache for indices in cluster. name: elasticsearch.cluster.indices.cache.evictions @@ -61,15 +61,15 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{evictions}' - description: The total number of nodes in the cluster. @@ -78,8 +78,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "46" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: The number of cluster-level changes that have not yet been executed. name: elasticsearch.cluster.pending_tasks @@ -87,8 +87,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1662457988667492000" - timeUnixNano: "1662457988669427000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{tasks}' - description: The number of shards in the cluster. name: elasticsearch.cluster.shards @@ -100,50 +100,50 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: state value: stringValue: active_primary - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: state value: stringValue: initializing - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: state value: stringValue: relocating - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: state value: stringValue: unassigned - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state value: stringValue: unassigned_delayed - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shards}' - description: The current heap memory usage gauge: dataPoints: - asInt: "285158912" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.used unit: By scope: @@ -172,8 +172,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -182,8 +182,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{evictions}' - description: The size in bytes of the cache for an index. @@ -199,8 +199,8 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -209,8 +209,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -219,8 +219,8 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -229,8 +229,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of elements of the query cache for an index. name: elasticsearch.index.cache.size @@ -242,15 +242,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of documents for an index. name: elasticsearch.index.documents @@ -265,8 +265,8 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -275,8 +275,8 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: The number of operations completed for an index. name: elasticsearch.index.operations.completed @@ -291,8 +291,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -301,8 +301,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -311,8 +311,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -321,8 +321,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -331,8 +331,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -341,8 +341,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -351,8 +351,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -361,8 +361,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -371,8 +371,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -381,8 +381,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -391,8 +391,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -401,8 +401,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -411,8 +411,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -421,8 +421,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -431,8 +431,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -441,8 +441,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -451,8 +451,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -461,8 +461,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -471,8 +471,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -481,8 +481,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -491,8 +491,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -501,8 +501,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The total number of documents in merge operations for an index. @@ -515,8 +515,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{documents}' - description: The total size of merged segments for an index. @@ -529,8 +529,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Time spent on operations for an index. @@ -546,8 +546,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -556,8 +556,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -566,8 +566,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -576,8 +576,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -586,8 +586,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -596,8 +596,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -606,8 +606,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -616,8 +616,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -626,8 +626,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -636,8 +636,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -646,8 +646,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -656,8 +656,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -666,8 +666,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -676,8 +676,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -686,8 +686,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -696,8 +696,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -706,8 +706,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -716,8 +716,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -726,8 +726,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -736,8 +736,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -746,8 +746,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -756,8 +756,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of segments of an index. @@ -770,15 +770,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{segments}' - description: Size of memory for segment object of an index. name: elasticsearch.index.segments.memory @@ -793,8 +793,8 @@ resourceMetrics: - key: object value: stringValue: doc_value - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: aggregation @@ -803,8 +803,8 @@ resourceMetrics: - key: object value: stringValue: fixed_bit_set - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "37" attributes: - key: aggregation @@ -813,8 +813,8 @@ resourceMetrics: - key: object value: stringValue: index_writer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2560" attributes: - key: aggregation @@ -823,8 +823,8 @@ resourceMetrics: - key: object value: stringValue: term - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "380" attributes: - key: aggregation @@ -833,8 +833,8 @@ resourceMetrics: - key: object value: stringValue: doc_value - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: aggregation @@ -843,8 +843,8 @@ resourceMetrics: - key: object value: stringValue: fixed_bit_set - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "37" attributes: - key: aggregation @@ -853,8 +853,8 @@ resourceMetrics: - key: object value: stringValue: index_writer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2560" attributes: - key: aggregation @@ -863,8 +863,8 @@ resourceMetrics: - key: object value: stringValue: term - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Size of segments of an index. name: elasticsearch.index.segments.size @@ -876,15 +876,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5460" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The size of the shards assigned to this index. name: elasticsearch.index.shards.size @@ -896,8 +896,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of transaction log operations for an index. name: elasticsearch.index.translog.operations @@ -909,8 +909,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Size of the transaction log for an index. @@ -923,8 +923,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver @@ -952,8 +952,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -962,8 +962,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{evictions}' - description: The size in bytes of the cache for an index. @@ -979,8 +979,8 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -989,8 +989,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -999,8 +999,8 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -1009,8 +1009,8 @@ resourceMetrics: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of elements of the query cache for an index. name: elasticsearch.index.cache.size @@ -1022,15 +1022,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of documents for an index. name: elasticsearch.index.documents @@ -1045,8 +1045,8 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -1055,8 +1055,8 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: The number of operations completed for an index. name: elasticsearch.index.operations.completed @@ -1071,8 +1071,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -1081,8 +1081,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -1091,8 +1091,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -1101,8 +1101,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -1111,8 +1111,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -1121,8 +1121,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -1131,8 +1131,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -1141,8 +1141,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -1151,8 +1151,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -1161,8 +1161,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -1171,8 +1171,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -1181,8 +1181,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -1191,8 +1191,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -1201,8 +1201,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -1211,8 +1211,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -1221,8 +1221,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -1231,8 +1231,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -1241,8 +1241,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -1251,8 +1251,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -1261,8 +1261,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -1271,8 +1271,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -1281,8 +1281,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The total number of documents in merge operations for an index. @@ -1295,8 +1295,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{documents}' - description: The total size of merged segments for an index. @@ -1309,8 +1309,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Time spent on operations for an index. @@ -1326,8 +1326,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -1336,8 +1336,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -1346,8 +1346,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -1356,8 +1356,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -1366,8 +1366,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -1376,8 +1376,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -1386,8 +1386,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -1396,8 +1396,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -1406,8 +1406,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -1416,8 +1416,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -1426,8 +1426,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -1436,8 +1436,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -1446,8 +1446,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -1456,8 +1456,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -1466,8 +1466,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -1476,8 +1476,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -1486,8 +1486,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -1496,8 +1496,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -1506,8 +1506,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -1516,8 +1516,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -1526,8 +1526,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -1536,8 +1536,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of segments of an index. @@ -1550,15 +1550,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{segments}' - description: Size of memory for segment object of an index. name: elasticsearch.index.segments.memory @@ -1573,8 +1573,8 @@ resourceMetrics: - key: object value: stringValue: doc_value - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: aggregation @@ -1583,8 +1583,8 @@ resourceMetrics: - key: object value: stringValue: fixed_bit_set - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "37" attributes: - key: aggregation @@ -1593,8 +1593,8 @@ resourceMetrics: - key: object value: stringValue: index_writer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2560" attributes: - key: aggregation @@ -1603,8 +1603,8 @@ resourceMetrics: - key: object value: stringValue: term - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "380" attributes: - key: aggregation @@ -1613,8 +1613,8 @@ resourceMetrics: - key: object value: stringValue: doc_value - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: aggregation @@ -1623,8 +1623,8 @@ resourceMetrics: - key: object value: stringValue: fixed_bit_set - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "37" attributes: - key: aggregation @@ -1633,8 +1633,8 @@ resourceMetrics: - key: object value: stringValue: index_writer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2560" attributes: - key: aggregation @@ -1643,8 +1643,8 @@ resourceMetrics: - key: object value: stringValue: term - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Size of segments of an index. name: elasticsearch.index.segments.size @@ -1656,15 +1656,15 @@ resourceMetrics: - key: aggregation value: stringValue: primary_shards - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5460" attributes: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The size of the shards assigned to this index. name: elasticsearch.index.shards.size @@ -1676,8 +1676,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of transaction log operations for an index. name: elasticsearch.index.translog.operations @@ -1689,8 +1689,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Size of the transaction log for an index. @@ -1703,8 +1703,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver @@ -1730,43 +1730,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "305152000" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.breaker.memory.estimated unit: By - description: Memory limit for the circuit breaker. @@ -1779,43 +1779,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "214748364" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "536870912" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "268435456" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "510027366" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1662950372948795000" - timeUnixNano: "1662950372950468000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "322122547" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total number of times the circuit breaker has been triggered and prevented an out of memory error. name: elasticsearch.breaker.tripped @@ -1827,43 +1827,43 @@ resourceMetrics: - key: name value: stringValue: accounting - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: in_flight_requests - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: model_inference - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: parent - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: request - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of differences between published cluster states. @@ -1876,15 +1876,15 @@ resourceMetrics: - key: state value: stringValue: compatible - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: incompatible - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Number of published cluster states. name: elasticsearch.cluster.published_states.full @@ -1892,8 +1892,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Number of cluster states in queue. name: elasticsearch.cluster.state_queue @@ -1905,15 +1905,15 @@ resourceMetrics: - key: state value: stringValue: committed - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: pending - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of cluster state update attempts that changed the cluster state since the node started. name: elasticsearch.cluster.state_update.count @@ -1925,22 +1925,22 @@ resourceMetrics: - key: state value: stringValue: failure - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state value: stringValue: success - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: state value: stringValue: unchanged - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The cumulative amount of time updating the cluster state since the node started. @@ -1956,8 +1956,8 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1966,8 +1966,8 @@ resourceMetrics: - key: type value: stringValue: completion - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1976,8 +1976,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1986,8 +1986,8 @@ resourceMetrics: - key: type value: stringValue: context_construction - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -1996,8 +1996,8 @@ resourceMetrics: - key: type value: stringValue: master_apply - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state @@ -2006,8 +2006,8 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "113" attributes: - key: state @@ -2016,8 +2016,8 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "117" attributes: - key: state @@ -2026,8 +2026,8 @@ resourceMetrics: - key: type value: stringValue: completion - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: state @@ -2036,8 +2036,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "17" attributes: - key: state @@ -2046,8 +2046,8 @@ resourceMetrics: - key: type value: stringValue: context_construction - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "484" attributes: - key: state @@ -2056,8 +2056,8 @@ resourceMetrics: - key: type value: stringValue: master_apply - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: state @@ -2066,8 +2066,8 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state @@ -2076,8 +2076,8 @@ resourceMetrics: - key: type value: stringValue: computation - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state @@ -2086,16 +2086,16 @@ resourceMetrics: - key: type value: stringValue: notification - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Configured memory limit, in bytes, for the indexing requests. gauge: dataPoints: - asInt: "53687091" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.indexing_pressure.memory.limit unit: By - description: Cumulative number of indexing requests rejected in the primary stage. @@ -2104,8 +2104,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of indexing requests rejected in the replica stage. @@ -2114,8 +2114,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Memory consumed, in bytes, by indexing requests in the specified stage. @@ -2128,22 +2128,22 @@ resourceMetrics: - key: stage value: stringValue: coordinating - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: stage value: stringValue: primary - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: stage value: stringValue: replica - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total count of query cache misses across all shards assigned to selected nodes. name: elasticsearch.node.cache.count @@ -2155,15 +2155,15 @@ resourceMetrics: - key: type value: stringValue: hit - startTimeUnixNano: "1662952599630580000" - timeUnixNano: "1662952599632385000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5324" attributes: - key: type value: stringValue: miss - startTimeUnixNano: "1662952599630580000" - timeUnixNano: "1662952599632385000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{count}' - description: The number of evictions from the cache on a node. name: elasticsearch.node.cache.evictions @@ -2175,15 +2175,15 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{evictions}' - description: The size in bytes of the cache on a node. @@ -2196,15 +2196,15 @@ resourceMetrics: - key: cache_name value: stringValue: fielddata - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "394" attributes: - key: cache_name value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total amount of memory used for the query cache across all shards assigned to the node. name: elasticsearch.node.cache.size @@ -2212,8 +2212,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "394" - startTimeUnixNano: "1670395732182417000" - timeUnixNano: "1670395732187524000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of open tcp connections for internal cluster communication. name: elasticsearch.node.cluster.connections @@ -2221,8 +2221,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "100" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: The number of bytes sent and received on the network for internal cluster communication. name: elasticsearch.node.cluster.io @@ -2234,15 +2234,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "157732" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The total number of kilobytes read across all file stores for this node. @@ -2251,8 +2251,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1617780" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The total number of kilobytes written across all file stores for this node. name: elasticsearch.node.disk.io.write @@ -2260,8 +2260,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "602016" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The number of documents on the node. name: elasticsearch.node.documents @@ -2273,15 +2273,15 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "200" attributes: - key: state value: stringValue: deleted - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: The amount of disk space available to the JVM across all file stores for this node. Depending on OS or process level restrictions, this might appear less than free. This is the actual amount of free disk space the Elasticsearch node can utilise. name: elasticsearch.node.fs.disk.available @@ -2289,8 +2289,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12293464064" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of unallocated disk space across all file stores for this node. name: elasticsearch.node.fs.disk.free @@ -2298,8 +2298,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15746158592" - startTimeUnixNano: "1642218266053041000" - timeUnixNano: "1642218266053039000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of disk space across all file stores for this node. name: elasticsearch.node.fs.disk.total @@ -2307,8 +2307,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67371577344" - startTimeUnixNano: "1642218266053041000" - timeUnixNano: "1642218266053039000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of HTTP connections to the node. name: elasticsearch.node.http.connections @@ -2316,8 +2316,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Total number of documents ingested during the lifetime of this node. name: elasticsearch.node.ingest.documents @@ -2325,8 +2325,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{documents}' - description: Total number of documents currently being ingested. @@ -2335,8 +2335,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Total number of failed ingest operations during the lifetime of this node. name: elasticsearch.node.ingest.operations.failed @@ -2344,8 +2344,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' - description: The number of open file descriptors held by the node. @@ -2354,8 +2354,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "270" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{files}' - description: The number of operations completed by a node. name: elasticsearch.node.operations.completed @@ -2367,78 +2367,78 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "234" attributes: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "345" attributes: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "600" attributes: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "200" attributes: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "124" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "958" attributes: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "235" attributes: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Number of query operations currently running. @@ -2449,8 +2449,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1670396411069414000" - timeUnixNano: "1670396411072189000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.node.operations.current unit: '{operations}' - description: The number of hits and misses resulting from GET operations. @@ -2463,15 +2463,15 @@ resourceMetrics: - key: result value: stringValue: hit - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "512" attributes: - key: result value: stringValue: miss - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The time spent on hits and misses resulting from GET operations. @@ -2484,15 +2484,15 @@ resourceMetrics: - key: result value: stringValue: hit - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "124" attributes: - key: result value: stringValue: miss - startTimeUnixNano: "1661811026803971000" - timeUnixNano: "1661811026805343000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Time spent on operations by a node. @@ -2505,78 +2505,78 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "256" attributes: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "995" attributes: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "500" attributes: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "300" attributes: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25345" attributes: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2354" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "544" attributes: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5234" attributes: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2342" attributes: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "664" attributes: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Total number of documents currently being ingested by a pipeline. @@ -2589,15 +2589,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Number of documents preprocessed by the ingest pipeline. name: elasticsearch.node.pipeline.ingest.documents.preprocessed @@ -2609,15 +2609,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: Total number of failed operations for the ingest pipeline. name: elasticsearch.node.pipeline.ingest.operations.failed @@ -2629,15 +2629,15 @@ resourceMetrics: - key: name value: stringValue: xpack_monitoring_6 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name value: stringValue: xpack_monitoring_7 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' - description: Total number of times the script cache has evicted old data. @@ -2646,8 +2646,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Total number of times the script compilation circuit breaker has limited inline script compilations. @@ -2656,8 +2656,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Total number of inline script compilations performed by the node. @@ -2666,8 +2666,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{compilations}' - description: Size of memory for segment object of a node. name: elasticsearch.node.segments.memory @@ -2679,29 +2679,29 @@ resourceMetrics: - key: object value: stringValue: doc_value - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "200" attributes: - key: object value: stringValue: fixed_bit_set - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "300" attributes: - key: object value: stringValue: index_writer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "400" attributes: - key: object value: stringValue: term - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total data set size of all shards assigned to the node. This includes the size of shards not stored fully on the node, such as the cache for partially mounted indices. name: elasticsearch.node.shards.data_set.size @@ -2709,8 +2709,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: A prediction of how much larger the shard stores on this node will eventually grow due to ongoing peer recoveries, restoring snapshots, and similar activities. A value of -1 indicates that this is not available. name: elasticsearch.node.shards.reserved.size @@ -2718,8 +2718,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The size of the shards assigned to this node. name: elasticsearch.node.shards.size @@ -2727,8 +2727,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "300" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of tasks finished by the thread pool. name: elasticsearch.node.thread_pool.tasks.finished @@ -2743,8 +2743,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: state @@ -2753,8 +2753,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{tasks}' - description: The number of queued tasks in the thread pool. @@ -2767,8 +2767,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{tasks}' - description: The number of threads in the thread pool. name: elasticsearch.node.thread_pool.threads @@ -2783,8 +2783,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "-2" attributes: - key: state @@ -2793,8 +2793,8 @@ resourceMetrics: - key: thread_pool_name value: stringValue: analyze - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: Number of transaction log operations. name: elasticsearch.node.translog.operations @@ -2802,8 +2802,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Size of the transaction log. @@ -2812,8 +2812,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Size of uncommitted transaction log operations. name: elasticsearch.node.translog.uncommitted.size @@ -2821,39 +2821,39 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Fifteen-minute load average on the system (field is not present if fifteen-minute load average is not available). gauge: dataPoints: - asDouble: 0.02 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.15m unit: "1" - description: One-minute load average on the system (field is not present if one-minute load average is not available). gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.1m unit: "1" - description: Five-minute load average on the system (field is not present if five-minute load average is not available). gauge: dataPoints: - asDouble: 0.02 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.load_avg.5m unit: "1" - description: Recent CPU usage for the whole system, or -1 if not supported. gauge: dataPoints: - asInt: "3" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.cpu.usage unit: '%' - description: Amount of physical memory. @@ -2864,15 +2864,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "779632640" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.os.memory unit: By - description: CPU time used by the process on which the Java virtual machine is running. @@ -2881,16 +2881,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "42970" - startTimeUnixNano: "1670400055325086000" - timeUnixNano: "1670400055330564000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: CPU usage in percent. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1670556275657741000" - timeUnixNano: "1670556275662037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: elasticsearch.process.cpu.usage unit: "1" - description: Size of virtual memory that is guaranteed to be available to the running process. @@ -2899,15 +2899,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4961767424" - startTimeUnixNano: "1670400872688367000" - timeUnixNano: "1670400872693424000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of loaded classes gauge: dataPoints: - asInt: "20695" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.classes.loaded unit: "1" - description: The total number of garbage collections that have occurred @@ -2920,15 +2920,15 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "20" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The approximate accumulated collection elapsed time @@ -2941,63 +2941,63 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "930" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The amount of memory that is guaranteed to be available for the heap gauge: dataPoints: - asInt: "536870912" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.committed unit: By - description: The maximum amount of memory can be used for the heap gauge: dataPoints: - asInt: "536870912" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.max unit: By - description: The current heap memory usage gauge: dataPoints: - asInt: "305152000" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.used unit: By - description: Fraction of heap memory usage gauge: dataPoints: - asDouble: 0.56 - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.heap.utilization unit: "1" - description: The amount of memory that is guaranteed to be available for non-heap purposes gauge: dataPoints: - asInt: "131792896" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.nonheap.committed unit: By - description: The current non-heap memory usage gauge: dataPoints: - asInt: "128825192" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.nonheap.used unit: By - description: The maximum amount of memory can be used for the memory pool @@ -3008,22 +3008,22 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "736870912" attributes: - key: name value: stringValue: survivor - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "636870912" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.pool.max unit: By - description: The current memory pool memory usage @@ -3034,30 +3034,30 @@ resourceMetrics: - key: name value: stringValue: old - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10485760" attributes: - key: name value: stringValue: survivor - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "218103808" attributes: - key: name value: stringValue: young - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.memory.pool.used unit: By - description: The current number of threads gauge: dataPoints: - asInt: "27" - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: jvm.threads.count unit: "1" scope: diff --git a/receiver/elasticsearchreceiver/testdata/expected_metrics/noNodes.yaml b/receiver/elasticsearchreceiver/testdata/expected_metrics/noNodes.yaml index f31f22f75892..e67810717bb9 100644 --- a/receiver/elasticsearchreceiver/testdata/expected_metrics/noNodes.yaml +++ b/receiver/elasticsearchreceiver/testdata/expected_metrics/noNodes.yaml @@ -12,8 +12,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: The health status of the cluster. name: elasticsearch.cluster.health @@ -25,22 +25,22 @@ resourceMetrics: - key: status value: stringValue: green - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status value: stringValue: red - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: status value: stringValue: yellow - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{status}' - description: The number of unfinished fetches. name: elasticsearch.cluster.in_flight_fetch @@ -48,8 +48,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{fetches}' - description: The total number of nodes in the cluster. name: elasticsearch.cluster.nodes @@ -57,8 +57,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "46" - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: The number of cluster-level changes that have not yet been executed. name: elasticsearch.cluster.pending_tasks @@ -66,8 +66,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{tasks}' - description: The number of shards in the cluster. name: elasticsearch.cluster.shards @@ -79,43 +79,43 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: state value: stringValue: active_primary - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: state value: stringValue: initializing - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: state value: stringValue: relocating - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: state value: stringValue: unassigned - startTimeUnixNano: "1662458370557980000" - timeUnixNano: "1662458370559258000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state value: stringValue: unassigned_delayed - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shards}' scope: name: otelcol/elasticsearchreceiver @@ -143,8 +143,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -153,8 +153,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -163,8 +163,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -173,8 +173,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -183,8 +183,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -193,8 +193,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -203,8 +203,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -213,8 +213,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -223,8 +223,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -233,8 +233,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -243,8 +243,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -253,8 +253,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -263,8 +263,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -273,8 +273,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -283,8 +283,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -293,8 +293,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -303,8 +303,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -313,8 +313,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -323,8 +323,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -333,8 +333,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -343,8 +343,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -353,8 +353,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Time spent on operations for an index. @@ -370,8 +370,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -380,8 +380,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -390,8 +390,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -400,8 +400,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -410,8 +410,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -420,8 +420,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -430,8 +430,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -440,8 +440,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -450,8 +450,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -460,8 +460,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -470,8 +470,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -480,8 +480,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -490,8 +490,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -500,8 +500,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -510,8 +510,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -520,8 +520,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -530,8 +530,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -540,8 +540,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -550,8 +550,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -560,8 +560,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -570,8 +570,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -580,8 +580,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The size of the shards assigned to this index. @@ -594,8 +594,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver @@ -623,8 +623,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -633,8 +633,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -643,8 +643,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -653,8 +653,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -663,8 +663,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -673,8 +673,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -683,8 +683,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -693,8 +693,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -703,8 +703,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -713,8 +713,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -723,8 +723,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -733,8 +733,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -743,8 +743,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -753,8 +753,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: aggregation @@ -763,8 +763,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: aggregation @@ -773,8 +773,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: aggregation @@ -783,8 +783,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: aggregation @@ -793,8 +793,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: aggregation @@ -803,8 +803,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -813,8 +813,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: aggregation @@ -823,8 +823,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: aggregation @@ -833,8 +833,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: Time spent on operations for an index. @@ -850,8 +850,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -860,8 +860,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -870,8 +870,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -880,8 +880,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -890,8 +890,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -900,8 +900,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -910,8 +910,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -920,8 +920,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -930,8 +930,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -940,8 +940,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -950,8 +950,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: aggregation @@ -960,8 +960,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "82" attributes: - key: aggregation @@ -970,8 +970,8 @@ resourceMetrics: - key: operation value: stringValue: fetch - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "192" attributes: - key: aggregation @@ -980,8 +980,8 @@ resourceMetrics: - key: operation value: stringValue: flush - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: aggregation @@ -990,8 +990,8 @@ resourceMetrics: - key: operation value: stringValue: get - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "938" attributes: - key: aggregation @@ -1000,8 +1000,8 @@ resourceMetrics: - key: operation value: stringValue: index - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: aggregation @@ -1010,8 +1010,8 @@ resourceMetrics: - key: operation value: stringValue: merge - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "52" attributes: - key: aggregation @@ -1020,8 +1020,8 @@ resourceMetrics: - key: operation value: stringValue: query - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "169" attributes: - key: aggregation @@ -1030,8 +1030,8 @@ resourceMetrics: - key: operation value: stringValue: refresh - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: aggregation @@ -1040,8 +1040,8 @@ resourceMetrics: - key: operation value: stringValue: scroll - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: aggregation @@ -1050,8 +1050,8 @@ resourceMetrics: - key: operation value: stringValue: suggest - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: aggregation @@ -1060,8 +1060,8 @@ resourceMetrics: - key: operation value: stringValue: warmer - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The size of the shards assigned to this index. @@ -1074,8 +1074,8 @@ resourceMetrics: - key: aggregation value: stringValue: total - startTimeUnixNano: "1661811689941624000" - timeUnixNano: "1661811689943245000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/elasticsearchreceiver diff --git a/receiver/expvarreceiver/testdata/metrics/expected_all_metrics.yaml b/receiver/expvarreceiver/testdata/metrics/expected_all_metrics.yaml index a2bab375cce5..20b1dfdb736d 100644 --- a/receiver/expvarreceiver/testdata/metrics/expected_all_metrics.yaml +++ b/receiver/expvarreceiver/testdata/metrics/expected_all_metrics.yaml @@ -8,8 +8,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3875" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cumulative count of heap objects freed. name: process.runtime.memstats.frees @@ -17,16 +17,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18672" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{objects}' - description: The fraction of this program's available CPU time used by the GC since the program started. gauge: dataPoints: - asDouble: 2.204356098795297e-06 - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: process.runtime.memstats.gc_cpu_fraction unit: "1" - description: Bytes of memory in garbage collection metadata. @@ -35,8 +35,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4590752" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of allocated heap objects. name: process.runtime.memstats.heap_alloc @@ -44,8 +44,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1266984" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes in idle (unused) spans. name: process.runtime.memstats.heap_idle @@ -53,8 +53,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5939200" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes in in-use spans. name: process.runtime.memstats.heap_inuse @@ -62,8 +62,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1925120" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of allocated heap objects. name: process.runtime.memstats.heap_objects @@ -71,8 +71,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3205" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{objects}' - description: Bytes of physical memory returned to the OS. name: process.runtime.memstats.heap_released @@ -80,8 +80,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3252224" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of heap memory obtained by the OS. name: process.runtime.memstats.heap_sys @@ -89,15 +89,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7864320" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The most recent stop-the-world pause time. gauge: dataPoints: - asInt: "93108" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: process.runtime.memstats.last_pause unit: ns - description: Number of pointer lookups performed by the runtime. @@ -106,8 +106,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{lookups}' - description: Cumulative count of heap objects allocated. name: process.runtime.memstats.mallocs @@ -115,8 +115,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21877" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{objects}' - description: Bytes of allocated mcache structures. @@ -125,8 +125,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14400" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of memory obtained from the OS for mcache structures. name: process.runtime.memstats.mcache_sys @@ -134,8 +134,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15600" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of allocated mspan structures. name: process.runtime.memstats.mspan_inuse @@ -143,8 +143,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "56168" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of memory obtained from the OS for mspan structures. name: process.runtime.memstats.mspan_sys @@ -152,8 +152,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "81600" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The target heap size of the next GC cycle. name: process.runtime.memstats.next_gc @@ -161,8 +161,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4194304" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of GC cycles that were forced by the application calling the GC function. name: process.runtime.memstats.num_forced_gc @@ -170,8 +170,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Number of completed GC cycles. @@ -180,8 +180,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Bytes of memory in miscellaneous off-heap runtime allocations. @@ -190,8 +190,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1029021" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The cumulative nanoseconds in GC stop-the-world pauses since the program started. name: process.runtime.memstats.pause_total @@ -199,8 +199,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "151575" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: Bytes in stack spans. @@ -209,8 +209,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "524288" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Bytes of stack memory obtained from the OS. name: process.runtime.memstats.stack_sys @@ -218,8 +218,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "524288" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Total bytes of memory obtained from the OS. name: process.runtime.memstats.sys @@ -227,8 +227,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14109456" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Cumulative bytes allocated for heap objects. name: process.runtime.memstats.total_alloc @@ -236,8 +236,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8102120" - startTimeUnixNano: "1653023581589787000" - timeUnixNano: "1653023581592037000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By scope: diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 5e5829f777be..132453d2214b 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -47,7 +47,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 3b6fcdf16a38..094650cd5670 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -422,8 +422,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/flinkmetricsreceiver/README.md b/receiver/flinkmetricsreceiver/README.md index bfde48577e39..904fd88cf9dc 100644 --- a/receiver/flinkmetricsreceiver/README.md +++ b/receiver/flinkmetricsreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [alpha]: metrics | | Distributions | [contrib], [observiq], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fflinkmetrics%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fflinkmetrics) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fflinkmetrics%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fflinkmetrics) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jonathanwamsley](https://www.github.com/jonathanwamsley), [@djaglowski](https://www.github.com/djaglowski) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@JonathanWamsley](https://www.github.com/JonathanWamsley), [@djaglowski](https://www.github.com/djaglowski) | [alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 69036ccbf732..c61604d04934 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -38,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index ba07681233ea..3efd0c141dd0 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/flinkmetricsreceiver/integration_test.go b/receiver/flinkmetricsreceiver/integration_test.go index 871b54f98bc9..73e9a62045e9 100644 --- a/receiver/flinkmetricsreceiver/integration_test.go +++ b/receiver/flinkmetricsreceiver/integration_test.go @@ -27,6 +27,7 @@ const ( ) func TestIntegration(t *testing.T) { + t.Skip("Flaky test, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26097") scraperinttest.NewIntegrationTest( NewFactory(), scraperinttest.WithNetworkRequest( diff --git a/receiver/flinkmetricsreceiver/metadata.yaml b/receiver/flinkmetricsreceiver/metadata.yaml index 335f8292ecca..116f8481abc6 100644 --- a/receiver/flinkmetricsreceiver/metadata.yaml +++ b/receiver/flinkmetricsreceiver/metadata.yaml @@ -6,7 +6,7 @@ status: alpha: [metrics] distributions: [contrib,observiq, sumo] codeowners: - active: [jonathanwamsley, djaglowski] + active: [JonathanWamsley, djaglowski] resource_attributes: # These resource attributes are Flinks system scope variables, which contains context information about metrics. These are required to uniquely identify incoming metrics as the same job can run multiple times concurrently. See https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/ops/metrics/#system-scope for more information. diff --git a/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_golden.yaml index 756282320374..88c71180a294 100644 --- a/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -19,15 +19,15 @@ resourceMetrics: - key: checkpoint value: stringValue: completed - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: checkpoint value: stringValue: failed - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: The number of checkpoints in progress. @@ -36,8 +36,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{checkpoints}' - description: The total size of the last checkpoint. name: flink.job.last_checkpoint.size @@ -45,15 +45,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The end to end duration of the last checkpoint. gauge: dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.job.last_checkpoint.time unit: ms - description: The total number of restarts since this job was submitted, including full restarts and fine-grained restarts. @@ -62,8 +62,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{restarts}' scope: @@ -89,15 +89,15 @@ resourceMetrics: - key: checkpoint value: stringValue: completed - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: checkpoint value: stringValue: failed - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: The number of checkpoints in progress. @@ -106,8 +106,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{checkpoints}' - description: The total size of the last checkpoint. name: flink.job.last_checkpoint.size @@ -115,15 +115,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The end to end duration of the last checkpoint. gauge: dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.job.last_checkpoint.time unit: ms - description: The total number of restarts since this job was submitted, including full restarts and fine-grained restarts. @@ -132,8 +132,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{restarts}' scope: @@ -155,16 +155,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.24 - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -173,8 +173,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -187,15 +187,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -208,15 +208,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -234,8 +234,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -243,8 +243,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -252,8 +252,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -261,8 +261,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -270,8 +270,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -279,8 +279,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -288,8 +288,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -297,8 +297,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -306,8 +306,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "23" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -315,8 +315,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -324,8 +324,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -351,8 +351,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -360,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -385,16 +385,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -403,8 +403,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -417,15 +417,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -438,15 +438,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -455,8 +455,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -464,8 +464,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -473,8 +473,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -482,8 +482,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -491,8 +491,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -500,8 +500,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -509,8 +509,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -518,8 +518,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -527,8 +527,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -536,8 +536,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -545,8 +545,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -554,8 +554,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -563,8 +563,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -572,8 +572,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -581,8 +581,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -590,8 +590,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -615,16 +615,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -633,8 +633,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -647,15 +647,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -668,15 +668,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -685,8 +685,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -694,8 +694,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -703,8 +703,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -712,8 +712,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -721,8 +721,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -730,8 +730,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -739,8 +739,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -748,8 +748,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -757,8 +757,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -766,8 +766,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -775,8 +775,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -784,8 +784,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -793,8 +793,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -802,8 +802,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -811,8 +811,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -820,8 +820,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -858,8 +858,8 @@ resourceMetrics: - key: record value: stringValue: dropped - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: name @@ -868,8 +868,8 @@ resourceMetrics: - key: record value: stringValue: in - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: name @@ -878,8 +878,8 @@ resourceMetrics: - key: record value: stringValue: out - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{records}' - description: The last watermark this operator has emitted. @@ -892,8 +892,8 @@ resourceMetrics: - key: name value: stringValue: Source__Custom_Source - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: ms - description: The number of records a task has. name: flink.task.record.count @@ -905,22 +905,22 @@ resourceMetrics: - key: record value: stringValue: dropped - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: record value: stringValue: in - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: record value: stringValue: out - startTimeUnixNano: "1656013018050954000" - timeUnixNano: "1656013018050996000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{records}' scope: diff --git a/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_no_jobs_golden.yaml b/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_no_jobs_golden.yaml index 80bc2a9a69a5..672f07135975 100644 --- a/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_no_jobs_golden.yaml +++ b/receiver/flinkmetricsreceiver/testdata/expected_metrics/metrics_no_jobs_golden.yaml @@ -15,16 +15,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.24 - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -33,8 +33,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -47,15 +47,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -68,15 +68,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -85,8 +85,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -94,8 +94,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -103,8 +103,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -112,8 +112,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -121,8 +121,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -130,8 +130,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -139,8 +139,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -148,8 +148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -157,8 +157,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -166,8 +166,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "23" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -175,8 +175,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -184,8 +184,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -193,8 +193,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -202,8 +202,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -211,8 +211,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -220,8 +220,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -245,16 +245,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -263,8 +263,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -277,15 +277,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -298,15 +298,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -315,8 +315,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -324,8 +324,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -351,8 +351,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -360,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -369,8 +369,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -378,8 +378,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -387,8 +387,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -396,8 +396,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -405,8 +405,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -414,8 +414,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -423,8 +423,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -432,8 +432,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -441,8 +441,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -450,8 +450,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -475,16 +475,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -493,8 +493,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -507,15 +507,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -528,15 +528,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -545,8 +545,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -554,8 +554,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -563,8 +563,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -572,8 +572,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -581,8 +581,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -590,8 +590,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -599,8 +599,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -608,8 +608,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -617,8 +617,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -626,8 +626,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -635,8 +635,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -644,8 +644,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -653,8 +653,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -662,8 +662,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -671,8 +671,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -680,8 +680,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018032146000" - timeUnixNano: "1656013018032191000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver diff --git a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_jobs.yaml b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_jobs.yaml index 77b5aaf1bd61..672f07135975 100644 --- a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_jobs.yaml +++ b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_jobs.yaml @@ -15,16 +15,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.24 - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -33,8 +33,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -47,15 +47,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -68,15 +68,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -85,8 +85,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -94,8 +94,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -103,8 +103,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -112,8 +112,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -121,8 +121,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -130,8 +130,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -139,8 +139,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -148,8 +148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -157,8 +157,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -166,8 +166,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "23" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -175,8 +175,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -184,8 +184,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -193,8 +193,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -202,8 +202,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -211,8 +211,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -220,8 +220,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -245,16 +245,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -263,8 +263,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -277,15 +277,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -298,15 +298,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -315,8 +315,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -324,8 +324,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -351,8 +351,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -360,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -369,8 +369,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -378,8 +378,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -387,8 +387,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -396,8 +396,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -405,8 +405,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -414,8 +414,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -423,8 +423,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -432,8 +432,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -441,8 +441,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -450,8 +450,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -475,16 +475,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -493,8 +493,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -507,15 +507,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -528,15 +528,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -545,8 +545,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -554,8 +554,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -563,8 +563,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -572,8 +572,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -581,8 +581,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -590,8 +590,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -599,8 +599,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -608,8 +608,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -617,8 +617,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -626,8 +626,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -635,8 +635,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -644,8 +644,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -653,8 +653,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -662,8 +662,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -671,8 +671,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -680,8 +680,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013017985668000" - timeUnixNano: "1656013017985722000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver diff --git a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_subtasks.yaml b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_subtasks.yaml index da8f7007e0c5..3d5ba0dd440a 100644 --- a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_subtasks.yaml +++ b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_subtasks.yaml @@ -19,15 +19,15 @@ resourceMetrics: - key: checkpoint value: stringValue: completed - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: checkpoint value: stringValue: failed - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: The number of checkpoints in progress. @@ -36,8 +36,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{checkpoints}' - description: The total size of the last checkpoint. name: flink.job.last_checkpoint.size @@ -45,15 +45,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The end to end duration of the last checkpoint. gauge: dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.job.last_checkpoint.time unit: ms - description: The total number of restarts since this job was submitted, including full restarts and fine-grained restarts. @@ -62,8 +62,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{restarts}' scope: @@ -89,15 +89,15 @@ resourceMetrics: - key: checkpoint value: stringValue: completed - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: checkpoint value: stringValue: failed - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: The number of checkpoints in progress. @@ -106,8 +106,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{checkpoints}' - description: The total size of the last checkpoint. name: flink.job.last_checkpoint.size @@ -115,15 +115,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The end to end duration of the last checkpoint. gauge: dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.job.last_checkpoint.time unit: ms - description: The total number of restarts since this job was submitted, including full restarts and fine-grained restarts. @@ -132,8 +132,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{restarts}' scope: @@ -155,16 +155,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.24 - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -173,8 +173,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -187,15 +187,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -208,15 +208,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -234,8 +234,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -243,8 +243,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -252,8 +252,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -261,8 +261,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -270,8 +270,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -279,8 +279,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -288,8 +288,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -297,8 +297,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -306,8 +306,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "23" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -315,8 +315,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -324,8 +324,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -333,8 +333,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -351,8 +351,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -360,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -385,16 +385,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -403,8 +403,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -417,15 +417,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -438,15 +438,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -455,8 +455,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -464,8 +464,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -473,8 +473,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -482,8 +482,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -491,8 +491,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -500,8 +500,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -509,8 +509,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -518,8 +518,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -527,8 +527,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -536,8 +536,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -545,8 +545,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -554,8 +554,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -563,8 +563,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -572,8 +572,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -581,8 +581,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -590,8 +590,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver @@ -615,16 +615,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "24" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.28 - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -633,8 +633,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -647,15 +647,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -668,15 +668,15 @@ resourceMetrics: - key: name value: stringValue: G1_Old_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: name value: stringValue: G1_Young_Generation - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -685,8 +685,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "22" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -694,8 +694,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -703,8 +703,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "9" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -712,8 +712,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -721,8 +721,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "30" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -730,8 +730,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -739,8 +739,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -748,8 +748,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -757,8 +757,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -766,8 +766,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -775,8 +775,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -784,8 +784,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "14" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -793,8 +793,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -802,8 +802,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -811,8 +811,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -820,8 +820,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013018010037000" - timeUnixNano: "1656013018010081000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver diff --git a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_taskmanagers.yaml b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_taskmanagers.yaml index 24bcf9a1304e..3218d6c1b044 100644 --- a/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_taskmanagers.yaml +++ b/receiver/flinkmetricsreceiver/testdata/expected_metrics/partial_metrics_no_taskmanagers.yaml @@ -15,16 +15,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "21" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{classes}' - description: The CPU usage of the JVM for a jobmanager or taskmanager. gauge: dataPoints: - asDouble: 0.24 - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: flink.jvm.cpu.load unit: '%' - description: The CPU time used by the JVM for a jobmanager or taskmanager. @@ -33,8 +33,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total number of collections that have occurred. @@ -47,15 +47,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{collections}' - description: The total time spent performing garbage collection. @@ -68,15 +68,15 @@ resourceMetrics: - key: name value: stringValue: PS_MarkSweep - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: name value: stringValue: PS_Scavenge - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The total capacity of all buffers in the direct buffer pool. @@ -85,8 +85,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the direct buffer pool. name: flink.jvm.memory.direct.used @@ -94,8 +94,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "18" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.heap.committed @@ -103,8 +103,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of heap memory that can be used for memory management. name: flink.jvm.memory.heap.max @@ -112,8 +112,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "25" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of heap memory currently used. name: flink.jvm.memory.heap.used @@ -121,8 +121,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of buffers in the mapped buffer pool. name: flink.jvm.memory.mapped.total_capacity @@ -130,8 +130,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used by the JVM for the mapped buffer pool. name: flink.jvm.memory.mapped.used @@ -139,8 +139,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory guaranteed to be available to the JVM in the Metaspace memory pool. name: flink.jvm.memory.metaspace.committed @@ -148,8 +148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of memory that can be used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.max @@ -157,8 +157,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "17" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory currently used in the Metaspace memory pool. name: flink.jvm.memory.metaspace.used @@ -166,8 +166,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "23" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory guaranteed to be available to the JVM. name: flink.jvm.memory.nonheap.committed @@ -175,8 +175,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "15" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The maximum amount of non-heap memory that can be used for memory management. name: flink.jvm.memory.nonheap.max @@ -184,8 +184,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of non-heap memory currently used. name: flink.jvm.memory.nonheap.used @@ -193,8 +193,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The total number of live threads. name: flink.jvm.threads.count @@ -202,8 +202,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{threads}' - description: The total amount of managed memory. name: flink.memory.managed.total @@ -211,8 +211,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of managed memory currently used. name: flink.memory.managed.used @@ -220,8 +220,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "29" - startTimeUnixNano: "1656013017962900000" - timeUnixNano: "1656013017962963000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By scope: name: otelcol/flinkmetricsreceiver diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index 6a31d8feec65..26ae36bbd413 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -33,7 +33,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -95,7 +95,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 0fec873441df..24ed22945468 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -199,8 +199,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -738,8 +738,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 5c3d3f8b3ac1..33cb69d9a334 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -13,7 +13,7 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 go.uber.org/zap v1.25.0 - google.golang.org/api v0.136.0 + google.golang.org/api v0.138.0 google.golang.org/grpc v1.57.0 ) @@ -29,7 +29,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 1c4da4f90cc6..53599dc20a0d 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -122,8 +122,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= @@ -461,8 +461,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.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 75943dbd9fa6..e70345948984 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/google go 1.20 require ( - cloud.google.com/go/spanner v1.47.0 + cloud.google.com/go/spanner v1.48.0 github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.4 @@ -13,7 +13,7 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 go.uber.org/zap v1.25.0 - google.golang.org/api v0.136.0 + google.golang.org/api v0.138.0 google.golang.org/grpc v1.57.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -36,7 +36,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.5 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index b6186e4f25d0..53d52ac71159 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -10,8 +10,8 @@ cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= -cloud.google.com/go/spanner v1.47.0 h1:aqiMP8dhsEXgn9K5EZBWxPG7dxIiyM2VaikqeU4iteg= -cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= +cloud.google.com/go/spanner v1.48.0 h1:lh3Xqe2G+/bhJ1O3JxYt4ahYXOz/wPH4D2Wrx2vFoNI= +cloud.google.com/go/spanner v1.48.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= @@ -135,8 +135,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= @@ -482,8 +482,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-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= diff --git a/receiver/haproxyreceiver/factory.go b/receiver/haproxyreceiver/factory.go index 8f660c4ad2ab..d67271c27170 100644 --- a/receiver/haproxyreceiver/factory.go +++ b/receiver/haproxyreceiver/factory.go @@ -37,16 +37,15 @@ func newReceiver( ) (receiver.Metrics, error) { haProxyCfg := cfg.(*Config) mp := newScraper(haProxyCfg, settings) - s, err := scraperhelper.NewScraper(settings.ID.Name(), mp.scrape) + s, err := scraperhelper.NewScraper(settings.ID.Name(), mp.scrape, scraperhelper.WithStart(mp.start)) if err != nil { return nil, err } - opt := scraperhelper.AddScraper(s) return scraperhelper.NewScraperControllerReceiver( &haProxyCfg.ScraperControllerSettings, settings, consumer, - opt, + scraperhelper.AddScraper(s), ) } diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index e502d483be52..f8fd1e7d2f70 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -7,6 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 github.com/stretchr/testify v1.8.4 + github.com/testcontainers/testcontainers-go v0.23.0 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/config/confighttp v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 @@ -18,8 +19,18 @@ require ( ) require ( + dario.cat/mergo v1.0.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/containerd/containerd v1.7.3 // indirect + github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/docker/docker v24.0.5+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect @@ -27,18 +38,29 @@ 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.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/patternmatcher v0.5.0 // indirect + github.com/moby/sys/sequential v0.5.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/morikuni/aec v1.0.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0-rc4 // indirect + github.com/opencontainers/runc v1.1.5 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.9.0 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector v0.83.0 // indirect go.opentelemetry.io/collector/config/configauth v0.83.0 // indirect @@ -56,9 +78,12 @@ require ( go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect + golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect + golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect + golang.org/x/tools v0.7.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index 6c18d6830c62..85c370593f25 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -1,7 +1,15 @@ 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= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +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-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= +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/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +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.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -28,18 +36,40 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o= +github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/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/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= 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/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.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -51,6 +81,7 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -72,6 +103,7 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -113,6 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -173,10 +207,13 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -206,6 +243,13 @@ github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= +github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +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/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= @@ -213,16 +257,28 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/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-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0= +github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= +github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -253,13 +309,19 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -275,6 +337,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs= +github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -344,6 +412,8 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -352,6 +422,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -367,6 +439,7 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= @@ -384,6 +457,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -394,11 +468,13 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -414,6 +490,11 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -427,6 +508,7 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -438,6 +520,8 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK 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.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= 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= @@ -474,6 +558,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD 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.27.1/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= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -495,6 +580,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/receiver/haproxyreceiver/integration_test.go b/receiver/haproxyreceiver/integration_test.go new file mode 100644 index 000000000000..74dff8d1a862 --- /dev/null +++ b/receiver/haproxyreceiver/integration_test.go @@ -0,0 +1,52 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:build integration +// +build integration + +package haproxyreceiver + +import ( + "fmt" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" + "github.com/testcontainers/testcontainers-go" + "go.opentelemetry.io/collector/component" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/scraperinttest" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" +) + +func TestIntegration(t *testing.T) { + cfgPath, err := filepath.Abs(filepath.Join("testdata", "haproxy.cfg")) + require.NoError(t, err) + haproxyPort := "8404" + scraperinttest.NewIntegrationTest( + NewFactory(), + scraperinttest.WithContainerRequest( + testcontainers.ContainerRequest{ + Image: "docker.io/library/haproxy:2.8.1", + ExposedPorts: []string{haproxyPort}, + Mounts: testcontainers.ContainerMounts{ + testcontainers.BindMount(cfgPath, "/usr/local/etc/haproxy/haproxy.cfg"), + }, + }), + scraperinttest.WithCustomConfig( + func(t *testing.T, cfg component.Config, ci *scraperinttest.ContainerInfo) { + rCfg := cfg.(*Config) + rCfg.ScraperControllerSettings.CollectionInterval = 100 * time.Millisecond + rCfg.Endpoint = fmt.Sprintf("http://%s:%s/stats", ci.Host(t), ci.MappedPort(t, haproxyPort)) + }), + scraperinttest.WithCompareOptions( + pmetrictest.IgnoreMetricValues(), + pmetrictest.IgnoreStartTimestamp(), + pmetrictest.IgnoreTimestamp(), + pmetrictest.IgnoreScopeVersion(), + pmetrictest.IgnoreMetricsOrder(), + pmetrictest.IgnoreResourceAttributeValue("haproxy.addr"), + ), + ).Run(t) +} diff --git a/receiver/haproxyreceiver/scraper.go b/receiver/haproxyreceiver/scraper.go index dc595c1404fd..70343ad03ad8 100644 --- a/receiver/haproxyreceiver/scraper.go +++ b/receiver/haproxyreceiver/scraper.go @@ -8,11 +8,15 @@ import ( "context" "encoding/csv" "fmt" + "io" "net" + "net/http" + "net/url" "strconv" "strings" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" @@ -28,30 +32,60 @@ var ( ) type scraper struct { - endpoint string - logger *zap.Logger - mb *metadata.MetricsBuilder + cfg *Config + httpClient *http.Client + logger *zap.Logger + mb *metadata.MetricsBuilder + telemetrySettings component.TelemetrySettings } func (s *scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { - var d net.Dialer - c, err := d.DialContext(ctx, "unix", s.endpoint) - if err != nil { - return pmetric.NewMetrics(), err - } - defer func(c net.Conn) { - _ = c.Close() - }(c) - records, err := s.readStats(c) - if err != nil { - return pmetric.NewMetrics(), err + + var records []map[string]string + if u, notURLerr := url.Parse(s.cfg.Endpoint); notURLerr == nil && strings.HasPrefix(u.Scheme, "http") { + + resp, err := s.httpClient.Get(s.cfg.Endpoint + ";csv") + if err != nil { + return pmetric.NewMetrics(), err + } + defer resp.Body.Close() + buf, err := io.ReadAll(resp.Body) + if err != nil { + return pmetric.NewMetrics(), err + } + records, err = s.readStats(buf) + if err != nil { + return pmetric.NewMetrics(), err + } + } else { + var d net.Dialer + c, err := d.DialContext(ctx, "unix", s.cfg.Endpoint) + if err != nil { + return pmetric.NewMetrics(), err + } + defer func(c net.Conn) { + _ = c.Close() + }(c) + _, err = c.Write(showStatsCommand) + if err != nil { + return pmetric.NewMetrics(), err + } + buf := make([]byte, 4096) + _, err = c.Read(buf) + if err != nil { + return pmetric.NewMetrics(), err + } + records, err = s.readStats(buf) + if err != nil { + return pmetric.NewMetrics(), err + } } var scrapeErrors []error now := pcommon.NewTimestampFromTime(time.Now()) for _, record := range records { - err = s.mb.RecordHaproxySessionsCountDataPoint(now, record["scur"]) + err := s.mb.RecordHaproxySessionsCountDataPoint(now, record["scur"]) if err != nil { scrapeErrors = append(scrapeErrors, err) } @@ -225,7 +259,7 @@ func (s *scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { rb := s.mb.NewResourceBuilder() rb.SetHaproxyProxyName(record["pxname"]) rb.SetHaproxyServiceName(record["svname"]) - rb.SetHaproxyAddr(s.endpoint) + rb.SetHaproxyAddr(s.cfg.Endpoint) s.mb.EmitForResource(metadata.WithResource(rb.Emit())) } @@ -235,16 +269,7 @@ func (s *scraper) scrape(ctx context.Context) (pmetric.Metrics, error) { return s.mb.Emit(), nil } -func (s *scraper) readStats(c net.Conn) ([]map[string]string, error) { - _, err := c.Write(showStatsCommand) - if err != nil { - return nil, err - } - buf := make([]byte, 4096) - _, err = c.Read(buf) - if err != nil { - return nil, err - } +func (s *scraper) readStats(buf []byte) ([]map[string]string, error) { reader := csv.NewReader(bytes.NewReader(buf)) headers, err := reader.Read() if err != nil { @@ -268,10 +293,17 @@ func (s *scraper) readStats(c net.Conn) ([]map[string]string, error) { return results, err } +func (s *scraper) start(_ context.Context, host component.Host) error { + var err error + s.httpClient, err = s.cfg.HTTPClientSettings.ToClient(host, s.telemetrySettings) + return err +} + func newScraper(cfg *Config, settings receiver.CreateSettings) *scraper { return &scraper{ - endpoint: cfg.Endpoint, - logger: settings.TelemetrySettings.Logger, - mb: metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings), + logger: settings.TelemetrySettings.Logger, + mb: metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings), + cfg: cfg, + telemetrySettings: settings.TelemetrySettings, } } diff --git a/receiver/haproxyreceiver/testdata/haproxy.cfg b/receiver/haproxyreceiver/testdata/haproxy.cfg new file mode 100644 index 000000000000..ac7ebccf3aea --- /dev/null +++ b/receiver/haproxyreceiver/testdata/haproxy.cfg @@ -0,0 +1,6 @@ +frontend stats + mode http + bind *:8404 + stats enable + stats uri /stats + diff --git a/receiver/haproxyreceiver/testdata/integration/expected.yaml b/receiver/haproxyreceiver/testdata/integration/expected.yaml new file mode 100644 index 000000000000..882247b1d7f8 --- /dev/null +++ b/receiver/haproxyreceiver/testdata/integration/expected.yaml @@ -0,0 +1,148 @@ +resourceMetrics: + - resource: + attributes: + - key: haproxy.addr + value: + stringValue: http://localhost:63810/stats + - key: haproxy.proxy_name + value: + stringValue: stats + - key: haproxy.service_name + value: + stringValue: FRONTEND + scopeMetrics: + - metrics: + - description: Bytes in. Corresponds to HAProxy's `bin` metric. + name: haproxy.bytes.input + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: by + - description: Bytes out. Corresponds to HAProxy's `bout` metric. + name: haproxy.bytes.output + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: by + - description: Number of connections over the last elapsed second (frontend). Corresponds to HAProxy's `conn_rate` metric. + gauge: + dataPoints: + - asInt: "1" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + name: haproxy.connections.rate + unit: '{connections}' + - description: Requests denied because of security concerns. Corresponds to HAProxy's `dreq` metric + name: haproxy.requests.denied + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: '{requests}' + - description: Cumulative number of request errors. Corresponds to HAProxy's `ereq` metric. + name: haproxy.requests.errors + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: '{errors}' + - description: HTTP requests per second over last elapsed second. Corresponds to HAProxy's `req_rate` metric. + gauge: + dataPoints: + - asDouble: 1 + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + name: haproxy.requests.rate + unit: '{requests}' + - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. + name: haproxy.requests.total + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: 1xx + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: 2xx + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: 3xx + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: 4xx + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: 5xx + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + - asInt: "0" + attributes: + - key: status_code + value: + stringValue: other + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: '{requests}' + - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric + name: haproxy.responses.denied + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + isMonotonic: true + unit: '{responses}' + - description: Current sessions. Corresponds to HAProxy's `scur` metric. + gauge: + dataPoints: + - asInt: "1" + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + name: haproxy.sessions.count + unit: '{sessions}' + - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. + gauge: + dataPoints: + - asDouble: 1 + startTimeUnixNano: "1691479578831831000" + timeUnixNano: "1691479579855985000" + name: haproxy.sessions.rate + unit: '{sessions}' + scope: + name: otelcol/haproxyreceiver + version: latest diff --git a/receiver/haproxyreceiver/testdata/scraper/expected.yaml b/receiver/haproxyreceiver/testdata/scraper/expected.yaml index 266039dbb5e6..15a4a9dc8ecb 100644 --- a/receiver/haproxyreceiver/testdata/scraper/expected.yaml +++ b/receiver/haproxyreceiver/testdata/scraper/expected.yaml @@ -18,8 +18,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "85470" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -28,16 +28,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "107711" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of connections over the last elapsed second (frontend). Corresponds to HAProxy's `conn_rate` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.connections.rate unit: '{connections}' - description: Requests denied because of security concerns. Corresponds to HAProxy's `dreq` metric @@ -46,8 +46,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Cumulative number of request errors. Corresponds to HAProxy's `ereq` metric. @@ -56,16 +56,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: HTTP requests per second over last elapsed second. Corresponds to HAProxy's `req_rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.requests.rate unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -78,43 +78,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "134" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -123,24 +123,24 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: @@ -165,8 +165,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1444" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -175,16 +175,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "47008" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of connections over the last elapsed second (frontend). Corresponds to HAProxy's `conn_rate` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.connections.rate unit: '{connections}' - description: Requests denied because of security concerns. Corresponds to HAProxy's `dreq` metric @@ -193,8 +193,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Cumulative number of request errors. Corresponds to HAProxy's `ereq` metric. @@ -203,16 +203,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: HTTP requests per second over last elapsed second. Corresponds to HAProxy's `req_rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.requests.rate unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -225,43 +225,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -270,24 +270,24 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: @@ -312,8 +312,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "85470" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -322,8 +322,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "107711" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of requests that encountered an error trying to connect to a backend server. The backend stat is the sum of the stat. Corresponds to HAProxy's `econ` metric @@ -332,8 +332,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a connection to a server was retried. Corresponds to HAProxy's `wretr` metric. @@ -342,8 +342,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{retries}' - description: Requests denied because of security concerns. Corresponds to HAProxy's `dreq` metric @@ -352,8 +352,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Current queued requests. For the backend this reports the number queued without a server assigned. Corresponds to HAProxy's `qcur` metric. @@ -362,8 +362,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Number of times a request was redispatched to another server. Corresponds to HAProxy's `wredis` metric. @@ -372,8 +372,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -386,43 +386,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "134" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -431,8 +431,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Cumulative number of response errors. Corresponds to HAProxy's `eresp` metric, `srv_abrt` will be counted here also. @@ -441,8 +441,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a server was selected, either for new sessions or when re-dispatching. Corresponds to HAProxy's `lbtot` metric. @@ -451,32 +451,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "134" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{selections}' - description: Average total session time in ms over the last 1024 requests. Corresponds to HAProxy's `ttime` metric. gauge: dataPoints: - asDouble: 105 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.average unit: ms - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: @@ -501,8 +501,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28734" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -511,8 +511,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "36204" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of requests that encountered an error trying to connect to a backend server. The backend stat is the sum of the stat. Corresponds to HAProxy's `econ` metric @@ -521,8 +521,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a connection to a server was retried. Corresponds to HAProxy's `wretr` metric. @@ -531,8 +531,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{retries}' - description: Current queued requests. For the backend this reports the number queued without a server assigned. Corresponds to HAProxy's `qcur` metric. @@ -541,8 +541,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Number of times a request was redispatched to another server. Corresponds to HAProxy's `wredis` metric. @@ -551,8 +551,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -565,43 +565,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "45" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -610,8 +610,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Cumulative number of response errors. Corresponds to HAProxy's `eresp` metric, `srv_abrt` will be counted here also. @@ -620,8 +620,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a server was selected, either for new sessions or when re-dispatching. Corresponds to HAProxy's `lbtot` metric. @@ -630,32 +630,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "45" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{selections}' - description: Average total session time in ms over the last 1024 requests. Corresponds to HAProxy's `ttime` metric. gauge: dataPoints: - asDouble: 95 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.average unit: ms - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: @@ -680,8 +680,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28664" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -690,8 +690,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "36131" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of requests that encountered an error trying to connect to a backend server. The backend stat is the sum of the stat. Corresponds to HAProxy's `econ` metric @@ -700,8 +700,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a connection to a server was retried. Corresponds to HAProxy's `wretr` metric. @@ -710,8 +710,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{retries}' - description: Current queued requests. For the backend this reports the number queued without a server assigned. Corresponds to HAProxy's `qcur` metric. @@ -720,8 +720,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Number of times a request was redispatched to another server. Corresponds to HAProxy's `wredis` metric. @@ -730,8 +730,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -744,43 +744,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "45" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -789,8 +789,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Cumulative number of response errors. Corresponds to HAProxy's `eresp` metric, `srv_abrt` will be counted here also. @@ -799,8 +799,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a server was selected, either for new sessions or when re-dispatching. Corresponds to HAProxy's `lbtot` metric. @@ -809,32 +809,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "45" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{selections}' - description: Average total session time in ms over the last 1024 requests. Corresponds to HAProxy's `ttime` metric. gauge: dataPoints: - asDouble: 99 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.average unit: ms - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: @@ -859,8 +859,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "28072" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Bytes out. Corresponds to HAProxy's `bout` metric. @@ -869,8 +869,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "35376" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: by - description: Number of requests that encountered an error trying to connect to a backend server. The backend stat is the sum of the stat. Corresponds to HAProxy's `econ` metric @@ -879,8 +879,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a connection to a server was retried. Corresponds to HAProxy's `wretr` metric. @@ -889,8 +889,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{retries}' - description: Current queued requests. For the backend this reports the number queued without a server assigned. Corresponds to HAProxy's `qcur` metric. @@ -899,8 +899,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Number of times a request was redispatched to another server. Corresponds to HAProxy's `wredis` metric. @@ -909,8 +909,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Total number of HTTP requests received. Corresponds to HAProxy's `req_tot`, `hrsp_1xx`, `hrsp_2xx`, `hrsp_3xx`, `hrsp_4xx`, `hrsp_5xx` and `hrsp_other` metrics. @@ -923,43 +923,43 @@ resourceMetrics: - key: status_code value: stringValue: 1xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "44" attributes: - key: status_code value: stringValue: 2xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 3xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 4xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: 5xx - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: status_code value: stringValue: other - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{requests}' - description: Responses denied because of security concerns. Corresponds to HAProxy's `dresp` metric @@ -968,8 +968,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{responses}' - description: Cumulative number of response errors. Corresponds to HAProxy's `eresp` metric, `srv_abrt` will be counted here also. @@ -978,8 +978,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{errors}' - description: Number of times a server was selected, either for new sessions or when re-dispatching. Corresponds to HAProxy's `lbtot` metric. @@ -988,32 +988,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "44" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{selections}' - description: Average total session time in ms over the last 1024 requests. Corresponds to HAProxy's `ttime` metric. gauge: dataPoints: - asDouble: 121 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.average unit: ms - description: Current sessions. Corresponds to HAProxy's `scur` metric. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.count unit: '{sessions}' - description: Number of sessions per second over last elapsed second. Corresponds to HAProxy's `rate` metric. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1692058656280148000" - timeUnixNano: "1692058656281657000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: haproxy.sessions.rate unit: '{sessions}' scope: diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 4ff440737170..ab7abeb63ea7 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -35,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -85,7 +85,7 @@ require ( go.opentelemetry.io/proto/otlp v0.19.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 56f075d12c22..27192167152f 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -193,8 +193,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -715,8 +715,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/httpcheckreceiver/README.md b/receiver/httpcheckreceiver/README.md index 413ca3082300..caac67130fc3 100644 --- a/receiver/httpcheckreceiver/README.md +++ b/receiver/httpcheckreceiver/README.md @@ -27,15 +27,16 @@ httpcheck.status{http.status_class:5xx, http.status_code:200,...} = 0 ## Configuration -The following configuration settings are required: +The following configuration settings are available: -- `endpoint`: The URL of the endpoint to be monitored. +- `targets` (required): The list of targets to be monitored. +- `collection_interval` (optional, default = `60s`): This receiver collects metrics on an interval. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. +- `initial_delay` (optional, default = `1s`): defines how long this receiver waits before starting. -The following configuration settings are optional: +Each target has the following properties: -- `method` (default: `GET`): The method used to call the endpoint. -- `collection_interval` (default = `60s`): This receiver collects metrics on an interval. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. -- `initial_delay` (default = `1s`): defines how long this receiver waits before starting. +- `endpoint` (required): the URL to be monitored +- `method` (optional, default: `GET`): The HTTP method used to call the endpoint ### Example Configuration diff --git a/receiver/httpcheckreceiver/testdata/expected_metrics/endpoint_404.yaml b/receiver/httpcheckreceiver/testdata/expected_metrics/endpoint_404.yaml index 3918a926faf2..986749ea99a4 100644 --- a/receiver/httpcheckreceiver/testdata/expected_metrics/endpoint_404.yaml +++ b/receiver/httpcheckreceiver/testdata/expected_metrics/endpoint_404.yaml @@ -31,8 +31,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -47,8 +47,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -63,8 +63,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: http.method @@ -79,8 +79,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -95,8 +95,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/httpcheckreceiver diff --git a/receiver/httpcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml b/receiver/httpcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml index 8f7cd93cba4b..7c55883e285f 100644 --- a/receiver/httpcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml +++ b/receiver/httpcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml @@ -45,8 +45,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -61,8 +61,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -77,8 +77,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -93,8 +93,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -109,8 +109,8 @@ resourceMetrics: - key: http.url value: stringValue: http://invalid-endpoint - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/httpcheckreceiver diff --git a/receiver/httpcheckreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/httpcheckreceiver/testdata/expected_metrics/metrics_golden.yaml index e8f205611383..ea9a6790dde1 100644 --- a/receiver/httpcheckreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/httpcheckreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -31,8 +31,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: http.method @@ -47,8 +47,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -63,8 +63,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -79,8 +79,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -95,8 +95,8 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/httpcheckreceiver diff --git a/receiver/httpcheckreceiver/testdata/expected_metrics/multiple_targets.yaml b/receiver/httpcheckreceiver/testdata/expected_metrics/multiple_targets.yaml index 829092aba844..26ad52b2064f 100644 --- a/receiver/httpcheckreceiver/testdata/expected_metrics/multiple_targets.yaml +++ b/receiver/httpcheckreceiver/testdata/expected_metrics/multiple_targets.yaml @@ -17,7 +17,6 @@ resourceMetrics: stringValue: http://127.0.0.1:8000 name: httpcheck.duration unit: ms - - description: 1 if the check resulted in status_code matching the status_class, otherwise 0. name: httpcheck.status sum: @@ -37,40 +36,40 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" - - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" attributes: - key: http.method value: stringValue: GET - key: http.status_class value: - stringValue: 2xx + stringValue: 1xx - key: http.status_code value: - intValue: "200" + intValue: "404" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" - - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" attributes: - key: http.method value: stringValue: GET - key: http.status_class value: - stringValue: 3xx + stringValue: 2xx - key: http.status_code value: intValue: "200" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -78,15 +77,15 @@ resourceMetrics: stringValue: GET - key: http.status_class value: - stringValue: 4xx + stringValue: 2xx - key: http.status_code value: - intValue: "200" + intValue: "404" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -94,15 +93,15 @@ resourceMetrics: stringValue: GET - key: http.status_class value: - stringValue: 5xx + stringValue: 3xx - key: http.status_code value: intValue: "200" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -110,15 +109,15 @@ resourceMetrics: stringValue: GET - key: http.status_class value: - stringValue: 1xx + stringValue: 3xx - key: http.status_code value: intValue: "404" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -126,47 +125,47 @@ resourceMetrics: stringValue: GET - key: http.status_class value: - stringValue: 2xx + stringValue: 4xx - key: http.status_code value: - intValue: "404" + intValue: "200" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" - - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" attributes: - key: http.method value: stringValue: GET - key: http.status_class value: - stringValue: 3xx + stringValue: 4xx - key: http.status_code value: intValue: "404" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" - - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" attributes: - key: http.method value: stringValue: GET - key: http.status_class value: - stringValue: 4xx + stringValue: 5xx - key: http.status_code value: - intValue: "404" + intValue: "200" - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: http.method @@ -181,11 +180,9 @@ resourceMetrics: - key: http.url value: stringValue: http://127.0.0.1:8000 - startTimeUnixNano: "1651783208655196000" - timeUnixNano: "1651783208656862000" - + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - scope: name: otelcol/httpcheckreceiver version: latest diff --git a/receiver/iisreceiver/README.md b/receiver/iisreceiver/README.md index 53590491c4b9..9d1e17d23f32 100644 --- a/receiver/iisreceiver/README.md +++ b/receiver/iisreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [beta]: metrics | | Distributions | [contrib], [observiq], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fiis%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fiis) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fiis%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fiis) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mrod1598](https://www.github.com/mrod1598), [@djaglowski](https://www.github.com/djaglowski) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@Mrod1598](https://www.github.com/Mrod1598), [@djaglowski](https://www.github.com/djaglowski) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 41822d75261e..fe565ee22070 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -32,7 +32,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index a2c03bf25ad0..72310f7d5067 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -136,8 +136,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/iisreceiver/metadata.yaml b/receiver/iisreceiver/metadata.yaml index 4ed4075d4206..3481f782d319 100644 --- a/receiver/iisreceiver/metadata.yaml +++ b/receiver/iisreceiver/metadata.yaml @@ -6,7 +6,7 @@ status: beta: [metrics] distributions: [contrib, observiq, sumo] codeowners: - active: [mrod1598, djaglowski] + active: [Mrod1598, djaglowski] resource_attributes: iis.site: diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index f471ee62e3dd..0bacabab4d8b 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -109,16 +109,8 @@ func (cfg *Config) Validate() error { } if cfg.RemoteSampling != nil { - if err := checkPortFromEndpoint(cfg.RemoteSampling.HostEndpoint); err != nil { - return fmt.Errorf("invalid port number for the Remote Sampling endpoint: %w", err) - } - - if len(cfg.RemoteSampling.StrategyFile) != 0 && cfg.GRPC == nil { - return fmt.Errorf("strategy file requires the gRPC protocol to be enabled") - } - - if cfg.RemoteSampling.StrategyFileReloadInterval < 0 { - return fmt.Errorf("strategy file reload interval should be great or equal zero") + if disableJaegerReceiverRemoteSampling.IsEnabled() { + return fmt.Errorf("remote sampling config detected in the Jaeger receiver; use the `jaegerremotesampling` extension instead") } } diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index 539958a6a5b2..9cc810e61c34 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -6,7 +6,6 @@ package jaegerreceiver import ( "path/filepath" "testing" - "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -62,14 +61,6 @@ func TestLoadConfig(t *testing.T) { }, }, }, - RemoteSampling: &RemoteSamplingConfig{ - HostEndpoint: "0.0.0.0:5778", - GRPCClientSettings: configgrpc.GRPCClientSettings{ - Endpoint: "jaeger-collector:1234", - }, - StrategyFile: "/etc/strategies.json", - StrategyFileReloadInterval: time.Second * 10, - }, }, }, { @@ -207,15 +198,6 @@ func TestInvalidConfig(t *testing.T) { }, err: "receiver creation with no port number for Thrift UDP - Binary must fail", }, - { - desc: "remote-sampling-http-no-port", - apply: func(cfg *Config) { - cfg.RemoteSampling = &RemoteSamplingConfig{ - HostEndpoint: "localhost:", - } - }, - err: "receiver creation with no port number for the remote sampling HTTP endpoint must fail", - }, { desc: "grpc-invalid-host", apply: func(cfg *Config) { @@ -244,37 +226,6 @@ func TestInvalidConfig(t *testing.T) { }, err: "receiver creation with too large port number must fail", }, - { - desc: "port-outside-of-range", - apply: func(cfg *Config) { - cfg.Protocols = Protocols{} - cfg.ThriftCompact = &ProtocolUDP{ - Endpoint: defaultThriftCompactBindEndpoint, - } - cfg.RemoteSampling = &RemoteSamplingConfig{ - HostEndpoint: "localhost:5778", - StrategyFile: "strategies.json", - } - }, - err: "receiver creation without gRPC and with remote sampling config", - }, - { - desc: "reload-interval-outside-of-range", - apply: func(cfg *Config) { - cfg.Protocols.GRPC = &configgrpc.GRPCServerSettings{ - NetAddr: confignet.NetAddr{ - Endpoint: "1234", - Transport: "tcp", - }, - } - cfg.RemoteSampling = &RemoteSamplingConfig{ - HostEndpoint: "localhost:5778", - StrategyFile: "strategies.json", - StrategyFileReloadInterval: -time.Second, - } - }, - err: "strategy file reload interval should be great zero", - }, } for _, tC := range testCases { t.Run(tC.desc, func(t *testing.T) { diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 9cf530ba5ce5..97cf361e8d34 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/metadata" @@ -32,6 +33,12 @@ const ( defaultThriftBinaryBindEndpoint = "0.0.0.0:6832" ) +var disableJaegerReceiverRemoteSampling = featuregate.GlobalRegistry().MustRegister( + "receiver.jaeger.DisableRemoteSampling", + featuregate.StageBeta, + featuregate.WithRegisterDescription("When enabled, the Jaeger Receiver will fail to start when it is configured with remote_sampling config. When disabled, the receiver will start and the remote_sampling config will be no-op."), +) + // NewFactory creates a new Jaeger receiver factory. func NewFactory() receiver.Factory { return receiver.NewFactory( @@ -97,6 +104,10 @@ func createTracesReceiver( config.AgentCompactThrift = *rCfg.ThriftCompact } + if rCfg.RemoteSampling != nil { + set.Logger.Warn("You are using a deprecated no-op `remote_sampling` option which will be removed soon; use a `jaegerremotesampling` extension instead") + } + // Create the receiver. return newJaegerReceiver(set.ID, &config, nextConsumer, set) } diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 50687c78072a..b5eb603727b6 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 go.opentelemetry.io/collector/consumer v0.83.0 + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 go.opentelemetry.io/collector/semconv v0.83.0 @@ -60,7 +61,6 @@ require ( go.opentelemetry.io/collector/exporter v0.83.0 // indirect go.opentelemetry.io/collector/extension v0.83.0 // indirect go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect diff --git a/receiver/jaegerreceiver/testdata/config.yaml b/receiver/jaegerreceiver/testdata/config.yaml index e380fcdd7a99..e382a352243f 100644 --- a/receiver/jaegerreceiver/testdata/config.yaml +++ b/receiver/jaegerreceiver/testdata/config.yaml @@ -20,11 +20,6 @@ jaeger/customname: max_packet_size: 65_536 workers: 5 socket_buffer_size: 0 - remote_sampling: - host_endpoint: "0.0.0.0:5778" - endpoint: "jaeger-collector:1234" - strategy_file: "/etc/strategies.json" - strategy_file_reload_interval: 10s # The following demonstrates how to enable protocols with defaults. jaeger/defaults: protocols: diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 81854b3c61a5..661c6e9ea44f 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -41,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 66fdad7835c2..9dbf21e494bb 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -849,8 +849,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/receiver/jmxreceiver/supported_jars.go b/receiver/jmxreceiver/supported_jars.go index 18b84ec93bb4..3a2c942e899a 100644 --- a/receiver/jmxreceiver/supported_jars.go +++ b/receiver/jmxreceiver/supported_jars.go @@ -31,6 +31,10 @@ func oldFormatProperties(c *Config, j supportedJar) error { // If you change this variable name, please open an issue in opentelemetry-java-contrib // so that repository's release automation can be updated var jmxMetricsGathererVersions = map[string]supportedJar{ + "0b947c255f3fd358343ab43475875dbb09233d369ff91a88a28c38f767a2a6fb": { + version: "1.29.0-alpha", + jar: "JMX metrics gatherer", + }, "32fead1e233e67dea56f0d08628540938a41ecd87a3b4c4bdf78193c3b62c6dd": { version: "1.28.0-alpha", jar: "JMX metrics gatherer", diff --git a/receiver/journaldreceiver/README.md b/receiver/journaldreceiver/README.md index 350d40892655..ddb41bdd11be 100644 --- a/receiver/journaldreceiver/README.md +++ b/receiver/journaldreceiver/README.md @@ -29,9 +29,11 @@ Journald receiver requires that: | `files` | | A list of journal files to read entries from | | `start_at` | `end` | At startup, where to start reading logs from the file. Options are beginning or end | | `units` | | A list of units to read entries from. See [Multiple filtering options](#multiple-filtering-options) examples. | +| `identifiers` | | Filter output by message identifiers (`SYSTEMD_IDENTIFIER`). See [Multiple filtering options](#multiple-filtering-options) examples. | | `matches` | | A list of matches to read entries from. See [Matches](#matches) and [Multiple filtering options](#multiple-filtering-options) examples. | | `priority` | `info` | Filter output by message priorities or priority ranges. See [Multiple filtering options](#multiple-filtering-options) examples. | | `grep` | | Filter output to entries where the MESSAGE= field matches the specified regular expression. See [Multiple filtering options](#multiple-filtering-options) examples. | +| `dmesg` | 'false' | Show only kernel messages. This shows logs from current boot and adds the match `_TRANSPORT=kernel`. See [Multiple filtering options](#multiple-filtering-options) examples. | | `storage` | none | The ID of a storage extension to be used to store cursors. Cursors allow the receiver to pick up where it left off in the case of a collector restart. If no storage extension is used, the receiver will manage cursors in memory only. | | `retry_on_failure.enabled` | `false` | If `true`, the receiver will pause reading a file and attempt to resend the current batch of logs if it encounters an error from downstream components. | | `retry_on_failure.initial_interval` | `1 second` | Time to wait after the first failure before retrying. | @@ -85,10 +87,14 @@ which is going to retrieve all entries which match at least one of the following In case of using multiple following options, conditions between them are logically `AND`ed and within them are logically `OR`ed: ```text +( dmesg ) +AND ( priority ) AND ( units[0] OR units[1] OR units[2] OR ... units[U] ) AND +( identifier[0] OR identifier[1] OR identifier[2] OR ... identifier[I] ) +AND ( matches[0] OR matches[1] OR matches[2] OR ... matches[M] ) AND ( grep ) @@ -106,14 +112,17 @@ Consider the following example: - kubelet - systemd priority: info + identifiers: + - systemd ``` The above configuration will be passed to `journalctl` as the following arguments -`journalctl ... --priority=info --unit=kubelet --unit=systemd _SYSTEMD_UNIT=ssh + _SYSTEMD_UNIT=kubelet _UID=1000`, +`journalctl ... --priority=info --unit=kubelet --unit=systemd --identifier=systemd _SYSTEMD_UNIT=ssh + _SYSTEMD_UNIT=kubelet _UID=1000`, which is going to effectively retrieve all entries which matches the following set of rules: - `_PRIORITY` is `6`, and - `_SYSTEMD_UNIT` is `kubelet` or `systemd`, and +- `SYSLOG_IDENTIFIER` `systemd`, and - entry matches at least one of the following rules: - `_SYSTEMD_UNIT` is `ssh` diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index a10b554b1acc..7d082961dc55 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -44,7 +44,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 91686ac71550..dbcb2aa8e6b8 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -417,8 +417,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/k8sclusterreceiver/README.md b/receiver/k8sclusterreceiver/README.md index 630beb9ed6bf..2bdd014f8aa5 100644 --- a/receiver/k8sclusterreceiver/README.md +++ b/receiver/k8sclusterreceiver/README.md @@ -7,7 +7,7 @@ | | [development]: logs | | Distributions | [contrib], [observiq], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fk8scluster%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fk8scluster) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fk8scluster%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fk8scluster) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@TylerHelmuth](https://www.github.com/TylerHelmuth) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [development]: https://github.com/open-telemetry/opentelemetry-collector#development diff --git a/receiver/k8sclusterreceiver/e2e_test.go b/receiver/k8sclusterreceiver/e2e_test.go index 299fc895f0e1..81d22a779cf2 100644 --- a/receiver/k8sclusterreceiver/e2e_test.go +++ b/receiver/k8sclusterreceiver/e2e_test.go @@ -36,9 +36,8 @@ const testKubeConfig = "/tmp/kube-config-otelcol-e2e-testing" // `/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 docker-telemetrygen +// make docker-otelcontribcol // KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image otelcontribcol:latest -// KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image telemetrygen:latest func TestE2E(t *testing.T) { var expected pmetric.Metrics expectedFile := filepath.Join("testdata", "e2e", "expected.yaml") diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 04c19377852b..84d2268137f9 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/google/go-cmp v0.5.9 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/iancoleman/strcase v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index e0a76a495610..9d14882864d3 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -790,8 +790,9 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/receiver/k8sclusterreceiver/metadata.yaml b/receiver/k8sclusterreceiver/metadata.yaml index 15c8edb1eb64..81261b1ee773 100644 --- a/receiver/k8sclusterreceiver/metadata.yaml +++ b/receiver/k8sclusterreceiver/metadata.yaml @@ -7,7 +7,7 @@ status: development: [logs] distributions: [contrib, splunk, observiq, sumo] codeowners: - active: [dmitryax] + active: [dmitryax, TylerHelmuth] sem_conv_version: 1.18.0 diff --git a/receiver/k8seventsreceiver/README.md b/receiver/k8seventsreceiver/README.md index 7d7121d6a22f..70c74e2c2d45 100644 --- a/receiver/k8seventsreceiver/README.md +++ b/receiver/k8seventsreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [alpha]: logs | | Distributions | [contrib], [observiq], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fk8sevents%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fk8sevents) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fk8sevents%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fk8sevents) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@TylerHelmuth](https://www.github.com/TylerHelmuth) | [alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index a0432bbc796f..60f6976e7b50 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -31,7 +31,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index c6f0df02cb53..4a8fa13e46a7 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -197,8 +197,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= diff --git a/receiver/k8seventsreceiver/metadata.yaml b/receiver/k8seventsreceiver/metadata.yaml index e6cb73619725..c8e1e10b1127 100644 --- a/receiver/k8seventsreceiver/metadata.yaml +++ b/receiver/k8seventsreceiver/metadata.yaml @@ -6,4 +6,4 @@ status: alpha: [logs] distributions: [contrib, splunk, observiq, sumo] codeowners: - active: [dmitryax] + active: [dmitryax, TylerHelmuth] diff --git a/receiver/k8sobjectsreceiver/README.md b/receiver/k8sobjectsreceiver/README.md index f4558f6f0337..9c1079d4403d 100644 --- a/receiver/k8sobjectsreceiver/README.md +++ b/receiver/k8sobjectsreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [alpha]: logs | | Distributions | [contrib], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fk8sobjects%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fk8sobjects) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fk8sobjects%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fk8sobjects) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@hvaghani221](https://www.github.com/hvaghani221) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@hvaghani221](https://www.github.com/hvaghani221), [@TylerHelmuth](https://www.github.com/TylerHelmuth) | [alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/k8sobjectsreceiver/config_test.go b/receiver/k8sobjectsreceiver/config_test.go index 35eb59daf292..293f73245cb0 100644 --- a/receiver/k8sobjectsreceiver/config_test.go +++ b/receiver/k8sobjectsreceiver/config_test.go @@ -13,83 +13,151 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "k8s.io/apimachinery/pkg/runtime/schema" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver/internal/metadata" ) func TestLoadConfig(t *testing.T) { t.Parallel() - cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) - require.NoError(t, err) - - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - - sub, err := cm.Sub("k8sobjects") - require.NoError(t, err) - require.NoError(t, component.UnmarshalConfig(sub, cfg)) - require.NotNil(t, cfg) - - err = component.ValidateConfig(cfg) - require.Error(t, err) - - cfg.makeDiscoveryClient = getMockDiscoveryClient - - err = component.ValidateConfig(cfg) - require.NoError(t, err) - - expected := []*K8sObjectsConfig{ + tests := []struct { + id component.ID + expected *Config + }{ + { + id: component.NewIDWithName(metadata.Type, ""), + expected: &Config{ + APIConfig: k8sconfig.APIConfig{ + AuthType: k8sconfig.AuthTypeServiceAccount, + }, + Objects: []*K8sObjectsConfig{ + { + Name: "pods", + Mode: PullMode, + Interval: time.Hour, + FieldSelector: "status.phase=Running", + LabelSelector: "environment in (production),tier in (frontend)", + gvr: &schema.GroupVersionResource{ + Group: "", + Version: "v1", + Resource: "pods", + }, + }, + { + Name: "events", + Mode: WatchMode, + Namespaces: []string{"default"}, + Group: "events.k8s.io", + ResourceVersion: "", + gvr: &schema.GroupVersionResource{ + Group: "events.k8s.io", + Version: "v1", + Resource: "events", + }, + }, + }, + makeDiscoveryClient: getMockDiscoveryClient, + }, + }, { - Name: "pods", - Mode: PullMode, - Interval: time.Hour, - FieldSelector: "status.phase=Running", - LabelSelector: "environment in (production),tier in (frontend)", - gvr: &schema.GroupVersionResource{ - Group: "", - Version: "v1", - Resource: "pods", + id: component.NewIDWithName(metadata.Type, "pull_with_resource"), + expected: &Config{ + APIConfig: k8sconfig.APIConfig{ + AuthType: k8sconfig.AuthTypeServiceAccount, + }, + Objects: []*K8sObjectsConfig{ + { + Name: "pods", + Mode: PullMode, + ResourceVersion: "1", + Interval: time.Hour, + gvr: &schema.GroupVersionResource{ + Group: "", + Version: "v1", + Resource: "pods", + }, + }, + { + Name: "events", + Mode: PullMode, + Interval: time.Hour, + gvr: &schema.GroupVersionResource{ + Group: "", + Version: "v1", + Resource: "events", + }, + }, + }, + makeDiscoveryClient: getMockDiscoveryClient, }, }, { - Name: "events", - Mode: WatchMode, - Namespaces: []string{"default"}, - Group: "events.k8s.io", - ResourceVersion: "", - gvr: &schema.GroupVersionResource{ - Group: "events.k8s.io", - Version: "v1", - Resource: "events", + id: component.NewIDWithName(metadata.Type, "watch_with_resource"), + expected: &Config{ + APIConfig: k8sconfig.APIConfig{ + AuthType: k8sconfig.AuthTypeServiceAccount, + }, + Objects: []*K8sObjectsConfig{ + { + Name: "events", + Mode: WatchMode, + Namespaces: []string{"default"}, + Group: "events.k8s.io", + ResourceVersion: "", + gvr: &schema.GroupVersionResource{ + Group: "events.k8s.io", + Version: "v1", + Resource: "events", + }, + }, + { + Name: "events", + Mode: WatchMode, + Namespaces: []string{"default"}, + Group: "events.k8s.io", + ResourceVersion: "2", + gvr: &schema.GroupVersionResource{ + Group: "events.k8s.io", + Version: "v1", + Resource: "events", + }, + }, + }, + makeDiscoveryClient: getMockDiscoveryClient, }, }, + { + id: component.NewIDWithName(metadata.Type, "invalid_resource"), + }, } - assert.EqualValues(t, expected, cfg.Objects) - -} - -func TestValidConfigs(t *testing.T) { - t.Parallel() - - cm, err := confmaptest.LoadConf(filepath.Join("testdata", "invalid_config.yaml")) - require.NoError(t, err) - - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - - sub, err := cm.Sub("k8sobjects/invalid_resource") - require.NoError(t, err) - require.NoError(t, component.UnmarshalConfig(sub, cfg)) - - cfg.makeDiscoveryClient = getMockDiscoveryClient - - err = component.ValidateConfig(cfg) - assert.ErrorContains(t, err, "resource fake_resource not found") + for _, tt := range tests { + t.Run(tt.id.String(), func(t *testing.T) { + cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) + require.NoError(t, err) + + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.makeDiscoveryClient = getMockDiscoveryClient + + sub, err := cm.Sub(tt.id.String()) + require.NoError(t, err) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) + + if tt.expected == nil { + err = component.ValidateConfig(cfg) + assert.Error(t, err) + return + } + assert.NoError(t, component.ValidateConfig(cfg)) + assert.Equal(t, tt.expected.AuthType, cfg.AuthType) + assert.Equal(t, tt.expected.Objects, cfg.Objects) + }) + } } func TestValidateResourceConflict(t *testing.T) { - t.Parallel() - mockClient := newMockDynamicClient() rCfg := createDefaultConfig().(*Config) rCfg.makeDynamicClient = mockClient.getMockDynamicClient @@ -121,75 +189,8 @@ func TestValidateResourceConflict(t *testing.T) { assert.Equal(t, "group2", rCfg.Objects[0].gvr.Group) } -func TestPullResourceVersion(t *testing.T) { - t.Parallel() - - cm, err := confmaptest.LoadConf(filepath.Join("testdata", "pull_resource_version_config.yaml")) - require.NoError(t, err) - - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - - sub, err := cm.Sub("k8sobjects") - require.NoError(t, err) - require.NoError(t, component.UnmarshalConfig(sub, cfg)) - require.NotNil(t, cfg) - - err = component.ValidateConfig(cfg) - require.Error(t, err) - - require.Equal(t, "1", cfg.Objects[0].ResourceVersion) - require.Equal(t, "", cfg.Objects[1].ResourceVersion) -} - -func TestWatchResourceVersion(t *testing.T) { - t.Parallel() - - cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config_watch_resource_version.yaml")) - require.NoError(t, err) - - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - - sub, err := cm.Sub("k8sobjects") - require.NoError(t, err) - require.NoError(t, component.UnmarshalConfig(sub, cfg)) - require.NotNil(t, cfg) - - err = component.ValidateConfig(cfg) +func TestClientRequired(t *testing.T) { + rCfg := createDefaultConfig().(*Config) + err := rCfg.Validate() require.Error(t, err) - - cfg.makeDiscoveryClient = getMockDiscoveryClient - - err = component.ValidateConfig(cfg) - require.NoError(t, err) - - expected := []*K8sObjectsConfig{ - { - Name: "events", - Mode: WatchMode, - Namespaces: []string{"default"}, - Group: "events.k8s.io", - ResourceVersion: "", - gvr: &schema.GroupVersionResource{ - Group: "events.k8s.io", - Version: "v1", - Resource: "events", - }, - }, - { - Name: "events", - Mode: WatchMode, - Namespaces: []string{"default"}, - Group: "events.k8s.io", - ResourceVersion: "2", - gvr: &schema.GroupVersionResource{ - Group: "events.k8s.io", - Version: "v1", - Resource: "events", - }, - }, - } - assert.EqualValues(t, expected, cfg.Objects) - } diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index d4a678e9eb5c..a837ae58bbe8 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -30,7 +30,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index 108c257a0be4..9c4dace12dbc 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -197,8 +197,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= diff --git a/receiver/k8sobjectsreceiver/metadata.yaml b/receiver/k8sobjectsreceiver/metadata.yaml index dabdec4d7c35..bfd1c1814d76 100644 --- a/receiver/k8sobjectsreceiver/metadata.yaml +++ b/receiver/k8sobjectsreceiver/metadata.yaml @@ -6,4 +6,4 @@ status: alpha: [logs] distributions: [contrib, splunk, sumo] codeowners: - active: [dmitryax, hvaghani221] + active: [dmitryax, hvaghani221, TylerHelmuth] diff --git a/receiver/k8sobjectsreceiver/testdata/config.yaml b/receiver/k8sobjectsreceiver/testdata/config.yaml index 835084b1b429..765d06269eba 100644 --- a/receiver/k8sobjectsreceiver/testdata/config.yaml +++ b/receiver/k8sobjectsreceiver/testdata/config.yaml @@ -7,4 +7,26 @@ k8sobjects: - name: events mode: watch group: events.k8s.io - namespaces: [default] \ No newline at end of file + namespaces: [default] +k8sobjects/pull_with_resource: + objects: + - name: pods + mode: pull + resource_version: "1" + - name: events + mode: pull +k8sobjects/watch_with_resource: + objects: + - name: events + mode: watch + group: events.k8s.io + namespaces: [default] + - name: events + mode: watch + group: events.k8s.io + namespaces: [default] + resource_version: "2" +k8sobjects/invalid_resource: + objects: + - name: fake_resource + mode: watch diff --git a/receiver/k8sobjectsreceiver/testdata/config_watch_resource_version.yaml b/receiver/k8sobjectsreceiver/testdata/config_watch_resource_version.yaml deleted file mode 100644 index 352684229b88..000000000000 --- a/receiver/k8sobjectsreceiver/testdata/config_watch_resource_version.yaml +++ /dev/null @@ -1,11 +0,0 @@ -k8sobjects: - objects: - - name: events - mode: watch - group: events.k8s.io - namespaces: [default] - - name: events - mode: watch - group: events.k8s.io - namespaces: [default] - resource_version: "2" \ No newline at end of file diff --git a/receiver/k8sobjectsreceiver/testdata/invalid_config.yaml b/receiver/k8sobjectsreceiver/testdata/invalid_config.yaml deleted file mode 100644 index bb1f99cd6fd2..000000000000 --- a/receiver/k8sobjectsreceiver/testdata/invalid_config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -k8sobjects/invalid_resource: - objects: - - name: fake_resource - mode: watch \ No newline at end of file diff --git a/receiver/k8sobjectsreceiver/testdata/pull_resource_version_config.yaml b/receiver/k8sobjectsreceiver/testdata/pull_resource_version_config.yaml deleted file mode 100644 index bc5de3144377..000000000000 --- a/receiver/k8sobjectsreceiver/testdata/pull_resource_version_config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -k8sobjects: - objects: - - name: pods - mode: pull - resource_version: "1" - - name: events - mode: pull - \ No newline at end of file diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index f26ba97b4a72..fa4b25ab826e 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -25,7 +25,7 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/apache/thrift v0.18.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/containerd v1.7.3 // indirect @@ -42,7 +42,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.3.0 // indirect + github.com/google/uuid v1.3.1 // 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 diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index e35c277373a4..7d07f63c8159 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -26,8 +26,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -155,8 +155,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index e3f5c6dadb70..a4f0943b7005 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -27,7 +27,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/eapache/go-resiliency v1.3.0 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 70841ca3a5e3..eb58bf0a5801 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -18,8 +18,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= diff --git a/receiver/kubeletstatsreceiver/README.md b/receiver/kubeletstatsreceiver/README.md index 323a53bdc376..08f8be9e54b7 100644 --- a/receiver/kubeletstatsreceiver/README.md +++ b/receiver/kubeletstatsreceiver/README.md @@ -6,7 +6,7 @@ | Stability | [beta]: metrics | | Distributions | [contrib], [observiq], [splunk], [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fkubeletstats%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Areceiver%2Fkubeletstats) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fkubeletstats%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Areceiver%2Fkubeletstats) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@dmitryax](https://www.github.com/dmitryax), [@TylerHelmuth](https://www.github.com/TylerHelmuth) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/receiver/kubeletstatsreceiver/documentation.md b/receiver/kubeletstatsreceiver/documentation.md index ce731241a56b..97f5c83f90e4 100644 --- a/receiver/kubeletstatsreceiver/documentation.md +++ b/receiver/kubeletstatsreceiver/documentation.md @@ -376,6 +376,40 @@ The inodes used by the filesystem. This may not equal inodes - free because file | ---- | ----------- | ---------- | | 1 | Gauge | Int | +## Optional Metrics + +The following metrics are not emitted by default. Each of them can be enabled by applying the following configuration: + +```yaml +metrics: + : + enabled: true +``` + +### container.uptime + +The time since the container started + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| s | Sum | Int | Cumulative | true | + +### k8s.node.uptime + +The time since the node started + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| s | Sum | Int | Cumulative | true | + +### k8s.pod.uptime + +The time since the pod started + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| s | Sum | Int | Cumulative | true | + ## Resource Attributes | Name | Description | Values | Enabled | diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 25052e6476f7..408ae9a387e9 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -16,26 +16,26 @@ require ( go.opentelemetry.io/collector/receiver v0.83.0 go.opentelemetry.io/collector/semconv v0.83.0 go.uber.org/zap v1.25.0 - k8s.io/api v0.27.4 - k8s.io/apimachinery v0.27.4 - k8s.io/client-go v0.27.4 + k8s.io/api v0.28.1 + k8s.io/apimachinery v0.28.1 + k8s.io/client-go v0.28.1 k8s.io/kubelet v0.27.4 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect - github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // 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/google/gnostic v0.5.7-v3refs // 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/google/uuid v1.3.1 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -78,9 +78,9 @@ require ( 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/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index c9ccd4739ee0..a4ee06d1250c 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -89,8 +89,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -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/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/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -125,8 +125,8 @@ github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -134,7 +134,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh 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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -170,8 +170,8 @@ 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/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 v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +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= 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= @@ -199,8 +199,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -335,10 +335,10 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/openshift/api v0.0.0-20180801171038-322a19404e37 h1:05irGU4HK4IauGGDbsk+ZHrm1wOzMLYjMlfaiqMrBYc= github.com/openshift/api v0.0.0-20180801171038-322a19404e37/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= @@ -381,7 +381,7 @@ github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.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.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= @@ -393,7 +393,6 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= 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= @@ -669,7 +668,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= 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= @@ -712,7 +711,6 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= @@ -739,7 +737,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -769,7 +766,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -780,30 +776,30 @@ 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.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= 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.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/kubelet v0.27.4 h1:P8+MoRx4ikcAc5eEa3k2A6kd8AXtoDRaoC8KX2HFZe4= k8s.io/kubelet v0.27.4/go.mod h1:2y4peCA57vKEhBcDL6Q5EkPuGP7FFxj9U41NV9hk1ac= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go b/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go index 78831593febe..858b969900cc 100644 --- a/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go +++ b/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/metadata" @@ -41,12 +42,20 @@ type metricDataAccumulator struct { mbs *metadata.MetricsBuilders } +func addUptimeMetric(mb *metadata.MetricsBuilder, uptimeMetric metadata.RecordIntDataPointFunc, startTime v1.Time, currentTime pcommon.Timestamp) { + if !startTime.IsZero() { + value := int64(time.Since(startTime.Time).Seconds()) + uptimeMetric(mb, currentTime, value) + } +} + func (a *metricDataAccumulator) nodeStats(s stats.NodeStats) { if !a.metricGroupsToCollect[NodeMetricGroup] { return } currentTime := pcommon.NewTimestampFromTime(a.time) + addUptimeMetric(a.mbs.NodeMetricsBuilder, metadata.NodeUptimeMetrics.Uptime, s.StartTime, currentTime) addCPUMetrics(a.mbs.NodeMetricsBuilder, metadata.NodeCPUMetrics, s.CPU, currentTime) addMemoryMetrics(a.mbs.NodeMetricsBuilder, metadata.NodeMemoryMetrics, s.Memory, currentTime) addFilesystemMetrics(a.mbs.NodeMetricsBuilder, metadata.NodeFilesystemMetrics, s.Fs, currentTime) @@ -66,6 +75,7 @@ func (a *metricDataAccumulator) podStats(s stats.PodStats) { } currentTime := pcommon.NewTimestampFromTime(a.time) + addUptimeMetric(a.mbs.PodMetricsBuilder, metadata.PodUptimeMetrics.Uptime, s.StartTime, currentTime) addCPUMetrics(a.mbs.PodMetricsBuilder, metadata.PodCPUMetrics, s.CPU, currentTime) addMemoryMetrics(a.mbs.PodMetricsBuilder, metadata.PodMemoryMetrics, s.Memory, currentTime) addFilesystemMetrics(a.mbs.PodMetricsBuilder, metadata.PodFilesystemMetrics, s.EphemeralStorage, currentTime) @@ -98,6 +108,7 @@ func (a *metricDataAccumulator) containerStats(sPod stats.PodStats, s stats.Cont } currentTime := pcommon.NewTimestampFromTime(a.time) + addUptimeMetric(a.mbs.ContainerMetricsBuilder, metadata.ContainerUptimeMetrics.Uptime, s.StartTime, currentTime) addCPUMetrics(a.mbs.ContainerMetricsBuilder, metadata.ContainerCPUMetrics, s.CPU, currentTime) addMemoryMetrics(a.mbs.ContainerMetricsBuilder, metadata.ContainerMemoryMetrics, s.Memory, currentTime) addFilesystemMetrics(a.mbs.ContainerMetricsBuilder, metadata.ContainerFilesystemMetrics, s.Rootfs, currentTime) diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go b/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go index 11701eb08db6..22b9ee9b681a 100644 --- a/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go +++ b/receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go @@ -105,7 +105,7 @@ func requireResourceOk(t *testing.T, resource pcommon.Resource) { } func TestWorkingSetMem(t *testing.T) { - metrics := indexedFakeMetrics() + metrics := indexedFakeMetrics(fakeMetrics()) requireContains(t, metrics, "k8s.pod.memory.working_set") requireContains(t, metrics, "container.memory.working_set") @@ -115,7 +115,7 @@ func TestWorkingSetMem(t *testing.T) { } func TestPageFaults(t *testing.T) { - metrics := indexedFakeMetrics() + metrics := indexedFakeMetrics(fakeMetrics()) requireContains(t, metrics, "k8s.pod.memory.page_faults") requireContains(t, metrics, "container.memory.page_faults") @@ -125,7 +125,7 @@ func TestPageFaults(t *testing.T) { } func TestMajorPageFaults(t *testing.T) { - metrics := indexedFakeMetrics() + metrics := indexedFakeMetrics(fakeMetrics()) requireContains(t, metrics, "k8s.pod.memory.major_page_faults") requireContains(t, metrics, "container.memory.major_page_faults") @@ -134,8 +134,36 @@ func TestMajorPageFaults(t *testing.T) { require.Equal(t, int64(12), value) } +func TestUptime(t *testing.T) { + rc := &fakeRestClient{} + statsProvider := NewStatsProvider(rc) + summary, _ := statsProvider.StatsSummary() + mgs := map[MetricGroup]bool{ + ContainerMetricGroup: true, + PodMetricGroup: true, + NodeMetricGroup: true, + } + + cfg := metadata.DefaultMetricsBuilderConfig() + cfg.Metrics.K8sNodeUptime.Enabled = true + cfg.Metrics.K8sPodUptime.Enabled = true + cfg.Metrics.ContainerUptime.Enabled = true + + mbs := &metadata.MetricsBuilders{ + NodeMetricsBuilder: metadata.NewMetricsBuilder(cfg, receivertest.NewNopCreateSettings()), + PodMetricsBuilder: metadata.NewMetricsBuilder(cfg, receivertest.NewNopCreateSettings()), + ContainerMetricsBuilder: metadata.NewMetricsBuilder(cfg, receivertest.NewNopCreateSettings()), + } + + metrics := indexedFakeMetrics(MetricsData(zap.NewNop(), summary, Metadata{}, mgs, mbs)) + + requireContains(t, metrics, "k8s.node.uptime") + requireContains(t, metrics, "k8s.pod.uptime") + requireContains(t, metrics, "container.uptime") +} + func TestEmitMetrics(t *testing.T) { - metrics := indexedFakeMetrics() + metrics := indexedFakeMetrics(fakeMetrics()) metricNames := []string{ "k8s.node.network.io", "k8s.node.network.errors", @@ -158,8 +186,7 @@ func requireContains(t *testing.T, metrics map[string][]pmetric.Metric, metricNa require.True(t, found) } -func indexedFakeMetrics() map[string][]pmetric.Metric { - mds := fakeMetrics() +func indexedFakeMetrics(mds []pmetric.Metrics) map[string][]pmetric.Metric { metrics := make(map[string][]pmetric.Metric) for _, md := range mds { for i := 0; i < md.ResourceMetrics().Len(); i++ { diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go index d6cf6f86d3c9..5ee2e99b88ce 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go @@ -36,6 +36,7 @@ type MetricsConfig struct { ContainerMemoryRss MetricConfig `mapstructure:"container.memory.rss"` ContainerMemoryUsage MetricConfig `mapstructure:"container.memory.usage"` ContainerMemoryWorkingSet MetricConfig `mapstructure:"container.memory.working_set"` + ContainerUptime MetricConfig `mapstructure:"container.uptime"` K8sNodeCPUTime MetricConfig `mapstructure:"k8s.node.cpu.time"` K8sNodeCPUUtilization MetricConfig `mapstructure:"k8s.node.cpu.utilization"` K8sNodeFilesystemAvailable MetricConfig `mapstructure:"k8s.node.filesystem.available"` @@ -49,6 +50,7 @@ type MetricsConfig struct { K8sNodeMemoryWorkingSet MetricConfig `mapstructure:"k8s.node.memory.working_set"` K8sNodeNetworkErrors MetricConfig `mapstructure:"k8s.node.network.errors"` K8sNodeNetworkIo MetricConfig `mapstructure:"k8s.node.network.io"` + K8sNodeUptime MetricConfig `mapstructure:"k8s.node.uptime"` K8sPodCPUTime MetricConfig `mapstructure:"k8s.pod.cpu.time"` K8sPodCPUUtilization MetricConfig `mapstructure:"k8s.pod.cpu.utilization"` K8sPodFilesystemAvailable MetricConfig `mapstructure:"k8s.pod.filesystem.available"` @@ -62,6 +64,7 @@ type MetricsConfig struct { K8sPodMemoryWorkingSet MetricConfig `mapstructure:"k8s.pod.memory.working_set"` K8sPodNetworkErrors MetricConfig `mapstructure:"k8s.pod.network.errors"` K8sPodNetworkIo MetricConfig `mapstructure:"k8s.pod.network.io"` + K8sPodUptime MetricConfig `mapstructure:"k8s.pod.uptime"` K8sVolumeAvailable MetricConfig `mapstructure:"k8s.volume.available"` K8sVolumeCapacity MetricConfig `mapstructure:"k8s.volume.capacity"` K8sVolumeInodes MetricConfig `mapstructure:"k8s.volume.inodes"` @@ -104,6 +107,9 @@ func DefaultMetricsConfig() MetricsConfig { ContainerMemoryWorkingSet: MetricConfig{ Enabled: true, }, + ContainerUptime: MetricConfig{ + Enabled: false, + }, K8sNodeCPUTime: MetricConfig{ Enabled: true, }, @@ -143,6 +149,9 @@ func DefaultMetricsConfig() MetricsConfig { K8sNodeNetworkIo: MetricConfig{ Enabled: true, }, + K8sNodeUptime: MetricConfig{ + Enabled: false, + }, K8sPodCPUTime: MetricConfig{ Enabled: true, }, @@ -182,6 +191,9 @@ func DefaultMetricsConfig() MetricsConfig { K8sPodNetworkIo: MetricConfig{ Enabled: true, }, + K8sPodUptime: MetricConfig{ + Enabled: false, + }, K8sVolumeAvailable: MetricConfig{ Enabled: true, }, diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go index 3d2b0ff02228..c54a8f787935 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go @@ -37,6 +37,7 @@ func TestMetricsBuilderConfig(t *testing.T) { ContainerMemoryRss: MetricConfig{Enabled: true}, ContainerMemoryUsage: MetricConfig{Enabled: true}, ContainerMemoryWorkingSet: MetricConfig{Enabled: true}, + ContainerUptime: MetricConfig{Enabled: true}, K8sNodeCPUTime: MetricConfig{Enabled: true}, K8sNodeCPUUtilization: MetricConfig{Enabled: true}, K8sNodeFilesystemAvailable: MetricConfig{Enabled: true}, @@ -50,6 +51,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sNodeMemoryWorkingSet: MetricConfig{Enabled: true}, K8sNodeNetworkErrors: MetricConfig{Enabled: true}, K8sNodeNetworkIo: MetricConfig{Enabled: true}, + K8sNodeUptime: MetricConfig{Enabled: true}, K8sPodCPUTime: MetricConfig{Enabled: true}, K8sPodCPUUtilization: MetricConfig{Enabled: true}, K8sPodFilesystemAvailable: MetricConfig{Enabled: true}, @@ -63,6 +65,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sPodMemoryWorkingSet: MetricConfig{Enabled: true}, K8sPodNetworkErrors: MetricConfig{Enabled: true}, K8sPodNetworkIo: MetricConfig{Enabled: true}, + K8sPodUptime: MetricConfig{Enabled: true}, K8sVolumeAvailable: MetricConfig{Enabled: true}, K8sVolumeCapacity: MetricConfig{Enabled: true}, K8sVolumeInodes: MetricConfig{Enabled: true}, @@ -103,6 +106,7 @@ func TestMetricsBuilderConfig(t *testing.T) { ContainerMemoryRss: MetricConfig{Enabled: false}, ContainerMemoryUsage: MetricConfig{Enabled: false}, ContainerMemoryWorkingSet: MetricConfig{Enabled: false}, + ContainerUptime: MetricConfig{Enabled: false}, K8sNodeCPUTime: MetricConfig{Enabled: false}, K8sNodeCPUUtilization: MetricConfig{Enabled: false}, K8sNodeFilesystemAvailable: MetricConfig{Enabled: false}, @@ -116,6 +120,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sNodeMemoryWorkingSet: MetricConfig{Enabled: false}, K8sNodeNetworkErrors: MetricConfig{Enabled: false}, K8sNodeNetworkIo: MetricConfig{Enabled: false}, + K8sNodeUptime: MetricConfig{Enabled: false}, K8sPodCPUTime: MetricConfig{Enabled: false}, K8sPodCPUUtilization: MetricConfig{Enabled: false}, K8sPodFilesystemAvailable: MetricConfig{Enabled: false}, @@ -129,6 +134,7 @@ func TestMetricsBuilderConfig(t *testing.T) { K8sPodMemoryWorkingSet: MetricConfig{Enabled: false}, K8sPodNetworkErrors: MetricConfig{Enabled: false}, K8sPodNetworkIo: MetricConfig{Enabled: false}, + K8sPodUptime: MetricConfig{Enabled: false}, K8sVolumeAvailable: MetricConfig{Enabled: false}, K8sVolumeCapacity: MetricConfig{Enabled: false}, K8sVolumeInodes: MetricConfig{Enabled: false}, diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go index de324e254be0..1c5511b47c62 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics.go @@ -578,6 +578,57 @@ func newMetricContainerMemoryWorkingSet(cfg MetricConfig) metricContainerMemoryW return m } +type metricContainerUptime struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills container.uptime metric with initial data. +func (m *metricContainerUptime) init() { + m.data.SetName("container.uptime") + m.data.SetDescription("The time since the container started") + m.data.SetUnit("s") + m.data.SetEmptySum() + m.data.Sum().SetIsMonotonic(true) + m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) +} + +func (m *metricContainerUptime) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Sum().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricContainerUptime) updateCapacity() { + if m.data.Sum().DataPoints().Len() > m.capacity { + m.capacity = m.data.Sum().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricContainerUptime) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricContainerUptime(cfg MetricConfig) metricContainerUptime { + m := metricContainerUptime{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + type metricK8sNodeCPUTime struct { data pmetric.Metric // data buffer for generated metric. config MetricConfig // metric config provided by user. @@ -1227,6 +1278,57 @@ func newMetricK8sNodeNetworkIo(cfg MetricConfig) metricK8sNodeNetworkIo { return m } +type metricK8sNodeUptime struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.node.uptime metric with initial data. +func (m *metricK8sNodeUptime) init() { + m.data.SetName("k8s.node.uptime") + m.data.SetDescription("The time since the node started") + m.data.SetUnit("s") + m.data.SetEmptySum() + m.data.Sum().SetIsMonotonic(true) + m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) +} + +func (m *metricK8sNodeUptime) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Sum().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sNodeUptime) updateCapacity() { + if m.data.Sum().DataPoints().Len() > m.capacity { + m.capacity = m.data.Sum().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sNodeUptime) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sNodeUptime(cfg MetricConfig) metricK8sNodeUptime { + m := metricK8sNodeUptime{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + type metricK8sPodCPUTime struct { data pmetric.Metric // data buffer for generated metric. config MetricConfig // metric config provided by user. @@ -1876,6 +1978,57 @@ func newMetricK8sPodNetworkIo(cfg MetricConfig) metricK8sPodNetworkIo { return m } +type metricK8sPodUptime struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.pod.uptime metric with initial data. +func (m *metricK8sPodUptime) init() { + m.data.SetName("k8s.pod.uptime") + m.data.SetDescription("The time since the pod started") + m.data.SetUnit("s") + m.data.SetEmptySum() + m.data.Sum().SetIsMonotonic(true) + m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) +} + +func (m *metricK8sPodUptime) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Sum().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sPodUptime) updateCapacity() { + if m.data.Sum().DataPoints().Len() > m.capacity { + m.capacity = m.data.Sum().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sPodUptime) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sPodUptime(cfg MetricConfig) metricK8sPodUptime { + m := metricK8sPodUptime{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + type metricK8sVolumeAvailable struct { data pmetric.Metric // data buffer for generated metric. config MetricConfig // metric config provided by user. @@ -2140,6 +2293,7 @@ type MetricsBuilder struct { metricContainerMemoryRss metricContainerMemoryRss metricContainerMemoryUsage metricContainerMemoryUsage metricContainerMemoryWorkingSet metricContainerMemoryWorkingSet + metricContainerUptime metricContainerUptime metricK8sNodeCPUTime metricK8sNodeCPUTime metricK8sNodeCPUUtilization metricK8sNodeCPUUtilization metricK8sNodeFilesystemAvailable metricK8sNodeFilesystemAvailable @@ -2153,6 +2307,7 @@ type MetricsBuilder struct { metricK8sNodeMemoryWorkingSet metricK8sNodeMemoryWorkingSet metricK8sNodeNetworkErrors metricK8sNodeNetworkErrors metricK8sNodeNetworkIo metricK8sNodeNetworkIo + metricK8sNodeUptime metricK8sNodeUptime metricK8sPodCPUTime metricK8sPodCPUTime metricK8sPodCPUUtilization metricK8sPodCPUUtilization metricK8sPodFilesystemAvailable metricK8sPodFilesystemAvailable @@ -2166,6 +2321,7 @@ type MetricsBuilder struct { metricK8sPodMemoryWorkingSet metricK8sPodMemoryWorkingSet metricK8sPodNetworkErrors metricK8sPodNetworkErrors metricK8sPodNetworkIo metricK8sPodNetworkIo + metricK8sPodUptime metricK8sPodUptime metricK8sVolumeAvailable metricK8sVolumeAvailable metricK8sVolumeCapacity metricK8sVolumeCapacity metricK8sVolumeInodes metricK8sVolumeInodes @@ -2200,6 +2356,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting metricContainerMemoryRss: newMetricContainerMemoryRss(mbc.Metrics.ContainerMemoryRss), metricContainerMemoryUsage: newMetricContainerMemoryUsage(mbc.Metrics.ContainerMemoryUsage), metricContainerMemoryWorkingSet: newMetricContainerMemoryWorkingSet(mbc.Metrics.ContainerMemoryWorkingSet), + metricContainerUptime: newMetricContainerUptime(mbc.Metrics.ContainerUptime), metricK8sNodeCPUTime: newMetricK8sNodeCPUTime(mbc.Metrics.K8sNodeCPUTime), metricK8sNodeCPUUtilization: newMetricK8sNodeCPUUtilization(mbc.Metrics.K8sNodeCPUUtilization), metricK8sNodeFilesystemAvailable: newMetricK8sNodeFilesystemAvailable(mbc.Metrics.K8sNodeFilesystemAvailable), @@ -2213,6 +2370,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting metricK8sNodeMemoryWorkingSet: newMetricK8sNodeMemoryWorkingSet(mbc.Metrics.K8sNodeMemoryWorkingSet), metricK8sNodeNetworkErrors: newMetricK8sNodeNetworkErrors(mbc.Metrics.K8sNodeNetworkErrors), metricK8sNodeNetworkIo: newMetricK8sNodeNetworkIo(mbc.Metrics.K8sNodeNetworkIo), + metricK8sNodeUptime: newMetricK8sNodeUptime(mbc.Metrics.K8sNodeUptime), metricK8sPodCPUTime: newMetricK8sPodCPUTime(mbc.Metrics.K8sPodCPUTime), metricK8sPodCPUUtilization: newMetricK8sPodCPUUtilization(mbc.Metrics.K8sPodCPUUtilization), metricK8sPodFilesystemAvailable: newMetricK8sPodFilesystemAvailable(mbc.Metrics.K8sPodFilesystemAvailable), @@ -2226,6 +2384,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting metricK8sPodMemoryWorkingSet: newMetricK8sPodMemoryWorkingSet(mbc.Metrics.K8sPodMemoryWorkingSet), metricK8sPodNetworkErrors: newMetricK8sPodNetworkErrors(mbc.Metrics.K8sPodNetworkErrors), metricK8sPodNetworkIo: newMetricK8sPodNetworkIo(mbc.Metrics.K8sPodNetworkIo), + metricK8sPodUptime: newMetricK8sPodUptime(mbc.Metrics.K8sPodUptime), metricK8sVolumeAvailable: newMetricK8sVolumeAvailable(mbc.Metrics.K8sVolumeAvailable), metricK8sVolumeCapacity: newMetricK8sVolumeCapacity(mbc.Metrics.K8sVolumeCapacity), metricK8sVolumeInodes: newMetricK8sVolumeInodes(mbc.Metrics.K8sVolumeInodes), @@ -2303,6 +2462,7 @@ func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { mb.metricContainerMemoryRss.emit(ils.Metrics()) mb.metricContainerMemoryUsage.emit(ils.Metrics()) mb.metricContainerMemoryWorkingSet.emit(ils.Metrics()) + mb.metricContainerUptime.emit(ils.Metrics()) mb.metricK8sNodeCPUTime.emit(ils.Metrics()) mb.metricK8sNodeCPUUtilization.emit(ils.Metrics()) mb.metricK8sNodeFilesystemAvailable.emit(ils.Metrics()) @@ -2316,6 +2476,7 @@ func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { mb.metricK8sNodeMemoryWorkingSet.emit(ils.Metrics()) mb.metricK8sNodeNetworkErrors.emit(ils.Metrics()) mb.metricK8sNodeNetworkIo.emit(ils.Metrics()) + mb.metricK8sNodeUptime.emit(ils.Metrics()) mb.metricK8sPodCPUTime.emit(ils.Metrics()) mb.metricK8sPodCPUUtilization.emit(ils.Metrics()) mb.metricK8sPodFilesystemAvailable.emit(ils.Metrics()) @@ -2329,6 +2490,7 @@ func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { mb.metricK8sPodMemoryWorkingSet.emit(ils.Metrics()) mb.metricK8sPodNetworkErrors.emit(ils.Metrics()) mb.metricK8sPodNetworkIo.emit(ils.Metrics()) + mb.metricK8sPodUptime.emit(ils.Metrics()) mb.metricK8sVolumeAvailable.emit(ils.Metrics()) mb.metricK8sVolumeCapacity.emit(ils.Metrics()) mb.metricK8sVolumeInodes.emit(ils.Metrics()) @@ -2409,6 +2571,11 @@ func (mb *MetricsBuilder) RecordContainerMemoryWorkingSetDataPoint(ts pcommon.Ti mb.metricContainerMemoryWorkingSet.recordDataPoint(mb.startTime, ts, val) } +// RecordContainerUptimeDataPoint adds a data point to container.uptime metric. +func (mb *MetricsBuilder) RecordContainerUptimeDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricContainerUptime.recordDataPoint(mb.startTime, ts, val) +} + // RecordK8sNodeCPUTimeDataPoint adds a data point to k8s.node.cpu.time metric. func (mb *MetricsBuilder) RecordK8sNodeCPUTimeDataPoint(ts pcommon.Timestamp, val float64) { mb.metricK8sNodeCPUTime.recordDataPoint(mb.startTime, ts, val) @@ -2474,6 +2641,11 @@ func (mb *MetricsBuilder) RecordK8sNodeNetworkIoDataPoint(ts pcommon.Timestamp, mb.metricK8sNodeNetworkIo.recordDataPoint(mb.startTime, ts, val, interfaceAttributeValue, directionAttributeValue.String()) } +// RecordK8sNodeUptimeDataPoint adds a data point to k8s.node.uptime metric. +func (mb *MetricsBuilder) RecordK8sNodeUptimeDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sNodeUptime.recordDataPoint(mb.startTime, ts, val) +} + // RecordK8sPodCPUTimeDataPoint adds a data point to k8s.pod.cpu.time metric. func (mb *MetricsBuilder) RecordK8sPodCPUTimeDataPoint(ts pcommon.Timestamp, val float64) { mb.metricK8sPodCPUTime.recordDataPoint(mb.startTime, ts, val) @@ -2539,6 +2711,11 @@ func (mb *MetricsBuilder) RecordK8sPodNetworkIoDataPoint(ts pcommon.Timestamp, v mb.metricK8sPodNetworkIo.recordDataPoint(mb.startTime, ts, val, interfaceAttributeValue, directionAttributeValue.String()) } +// RecordK8sPodUptimeDataPoint adds a data point to k8s.pod.uptime metric. +func (mb *MetricsBuilder) RecordK8sPodUptimeDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sPodUptime.recordDataPoint(mb.startTime, ts, val) +} + // RecordK8sVolumeAvailableDataPoint adds a data point to k8s.volume.available metric. func (mb *MetricsBuilder) RecordK8sVolumeAvailableDataPoint(ts pcommon.Timestamp, val int64) { mb.metricK8sVolumeAvailable.recordDataPoint(mb.startTime, ts, val) diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go index 9aee6b9b887b..9dc39efa019b 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go @@ -98,6 +98,9 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordContainerMemoryWorkingSetDataPoint(ts, 1) + allMetricsCount++ + mb.RecordContainerUptimeDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordK8sNodeCPUTimeDataPoint(ts, 1) @@ -150,6 +153,9 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordK8sNodeNetworkIoDataPoint(ts, 1, "interface-val", AttributeDirectionReceive) + allMetricsCount++ + mb.RecordK8sNodeUptimeDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordK8sPodCPUTimeDataPoint(ts, 1) @@ -202,6 +208,9 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordK8sPodNetworkIoDataPoint(ts, 1, "interface-val", AttributeDirectionReceive) + allMetricsCount++ + mb.RecordK8sPodUptimeDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordK8sVolumeAvailableDataPoint(ts, 1) @@ -394,6 +403,20 @@ func TestMetricsBuilder(t *testing.T) { assert.Equal(t, ts, dp.Timestamp()) assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) assert.Equal(t, int64(1), dp.IntValue()) + case "container.uptime": + assert.False(t, validatedMetrics["container.uptime"], "Found a duplicate in the metrics slice: container.uptime") + validatedMetrics["container.uptime"] = true + assert.Equal(t, pmetric.MetricTypeSum, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Sum().DataPoints().Len()) + assert.Equal(t, "The time since the container started", ms.At(i).Description()) + assert.Equal(t, "s", ms.At(i).Unit()) + assert.Equal(t, true, ms.At(i).Sum().IsMonotonic()) + assert.Equal(t, pmetric.AggregationTemporalityCumulative, ms.At(i).Sum().AggregationTemporality()) + dp := ms.At(i).Sum().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) case "k8s.node.cpu.time": assert.False(t, validatedMetrics["k8s.node.cpu.time"], "Found a duplicate in the metrics slice: k8s.node.cpu.time") validatedMetrics["k8s.node.cpu.time"] = true @@ -568,6 +591,20 @@ func TestMetricsBuilder(t *testing.T) { attrVal, ok = dp.Attributes().Get("direction") assert.True(t, ok) assert.EqualValues(t, "receive", attrVal.Str()) + case "k8s.node.uptime": + assert.False(t, validatedMetrics["k8s.node.uptime"], "Found a duplicate in the metrics slice: k8s.node.uptime") + validatedMetrics["k8s.node.uptime"] = true + assert.Equal(t, pmetric.MetricTypeSum, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Sum().DataPoints().Len()) + assert.Equal(t, "The time since the node started", ms.At(i).Description()) + assert.Equal(t, "s", ms.At(i).Unit()) + assert.Equal(t, true, ms.At(i).Sum().IsMonotonic()) + assert.Equal(t, pmetric.AggregationTemporalityCumulative, ms.At(i).Sum().AggregationTemporality()) + dp := ms.At(i).Sum().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) case "k8s.pod.cpu.time": assert.False(t, validatedMetrics["k8s.pod.cpu.time"], "Found a duplicate in the metrics slice: k8s.pod.cpu.time") validatedMetrics["k8s.pod.cpu.time"] = true @@ -742,6 +779,20 @@ func TestMetricsBuilder(t *testing.T) { attrVal, ok = dp.Attributes().Get("direction") assert.True(t, ok) assert.EqualValues(t, "receive", attrVal.Str()) + case "k8s.pod.uptime": + assert.False(t, validatedMetrics["k8s.pod.uptime"], "Found a duplicate in the metrics slice: k8s.pod.uptime") + validatedMetrics["k8s.pod.uptime"] = true + assert.Equal(t, pmetric.MetricTypeSum, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Sum().DataPoints().Len()) + assert.Equal(t, "The time since the pod started", ms.At(i).Description()) + assert.Equal(t, "s", ms.At(i).Unit()) + assert.Equal(t, true, ms.At(i).Sum().IsMonotonic()) + assert.Equal(t, pmetric.AggregationTemporalityCumulative, ms.At(i).Sum().AggregationTemporality()) + dp := ms.At(i).Sum().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) case "k8s.volume.available": assert.False(t, validatedMetrics["k8s.volume.available"], "Found a duplicate in the metrics slice: k8s.volume.available") validatedMetrics["k8s.volume.available"] = true diff --git a/receiver/kubeletstatsreceiver/internal/metadata/metrics.go b/receiver/kubeletstatsreceiver/internal/metadata/metrics.go index c95dfe8f9451..838a53efd3ba 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/metrics.go +++ b/receiver/kubeletstatsreceiver/internal/metadata/metrics.go @@ -128,3 +128,19 @@ var K8sVolumeMetrics = VolumeMetrics{ InodesFree: (*MetricsBuilder).RecordK8sVolumeInodesFreeDataPoint, InodesUsed: (*MetricsBuilder).RecordK8sVolumeInodesUsedDataPoint, } + +type UptimeMetrics struct { + Uptime RecordIntDataPointFunc +} + +var NodeUptimeMetrics = UptimeMetrics{ + Uptime: (*MetricsBuilder).RecordK8sNodeUptimeDataPoint, +} + +var PodUptimeMetrics = UptimeMetrics{ + Uptime: (*MetricsBuilder).RecordK8sPodUptimeDataPoint, +} + +var ContainerUptimeMetrics = UptimeMetrics{ + Uptime: (*MetricsBuilder).RecordContainerUptimeDataPoint, +} diff --git a/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml b/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml index bd960d239a07..e79fe3db7171 100644 --- a/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml +++ b/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml @@ -23,6 +23,8 @@ all_set: enabled: true container.memory.working_set: enabled: true + container.uptime: + enabled: true k8s.node.cpu.time: enabled: true k8s.node.cpu.utilization: @@ -49,6 +51,8 @@ all_set: enabled: true k8s.node.network.io: enabled: true + k8s.node.uptime: + enabled: true k8s.pod.cpu.time: enabled: true k8s.pod.cpu.utilization: @@ -75,6 +79,8 @@ all_set: enabled: true k8s.pod.network.io: enabled: true + k8s.pod.uptime: + enabled: true k8s.volume.available: enabled: true k8s.volume.capacity: @@ -140,6 +146,8 @@ none_set: enabled: false container.memory.working_set: enabled: false + container.uptime: + enabled: false k8s.node.cpu.time: enabled: false k8s.node.cpu.utilization: @@ -166,6 +174,8 @@ none_set: enabled: false k8s.node.network.io: enabled: false + k8s.node.uptime: + enabled: false k8s.pod.cpu.time: enabled: false k8s.pod.cpu.utilization: @@ -192,6 +202,8 @@ none_set: enabled: false k8s.pod.network.io: enabled: false + k8s.pod.uptime: + enabled: false k8s.volume.available: enabled: false k8s.volume.capacity: diff --git a/receiver/kubeletstatsreceiver/metadata.yaml b/receiver/kubeletstatsreceiver/metadata.yaml index 994ccc65e5ff..19169c2d465c 100644 --- a/receiver/kubeletstatsreceiver/metadata.yaml +++ b/receiver/kubeletstatsreceiver/metadata.yaml @@ -6,7 +6,7 @@ status: beta: [metrics] distributions: [contrib, observiq, splunk, sumo] codeowners: - active: [dmitryax] + active: [dmitryax, TylerHelmuth] resource_attributes: k8s.node.name: @@ -178,6 +178,15 @@ metrics: monotonic: true aggregation_temporality: cumulative attributes: ["interface", "direction"] + k8s.node.uptime: + enabled: false + description: "The time since the node started" + unit: s + sum: + value_type: int + monotonic: true + aggregation_temporality: cumulative + attributes: [] k8s.pod.cpu.utilization: enabled: true description: "Pod CPU utilization" @@ -275,6 +284,15 @@ metrics: monotonic: true aggregation_temporality: cumulative attributes: ["interface", "direction"] + k8s.pod.uptime: + enabled: false + description: "The time since the pod started" + unit: s + sum: + value_type: int + monotonic: true + aggregation_temporality: cumulative + attributes: [] container.cpu.utilization: enabled: true description: "Container CPU utilization" @@ -354,6 +372,15 @@ metrics: gauge: value_type: int attributes: [] + container.uptime: + enabled: false + description: "The time since the container started" + unit: s + sum: + value_type: int + monotonic: true + aggregation_temporality: cumulative + attributes: [] k8s.volume.available: enabled: true description: "The number of available bytes in the volume." diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index e90bdca71312..8321c54ccc3e 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -4,8 +4,6 @@ package memcachedreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver" import ( - "time" - "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -16,9 +14,6 @@ type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` confignet.NetAddr `mapstructure:",squash"` - // Timeout for the memcache stats request - Timeout time.Duration `mapstructure:"timeout"` - // MetricsBuilderConfig allows customizing scraped metrics/attributes representation. metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 897635ed5ba8..faf73a2e9368 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -33,10 +33,10 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) cfg.CollectionInterval = defaultCollectionInterval + cfg.Timeout = defaultTimeout return &Config{ ScraperControllerSettings: cfg, - Timeout: defaultTimeout, NetAddr: confignet.NetAddr{ Endpoint: defaultEndpoint, }, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 5e58002e158e..84eef9b47646 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -33,7 +33,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index d36d759ae669..b24d892696da 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -137,8 +137,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 h1:LONJvPBBd9wBmzSUmNHI7XpLE2qQ5tzUimeBadiVDuA= github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665/go.mod h1:L69/dBlPQlWkcnU76WgcppK5e4rrxzQdi6LhLnK/ytA= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= diff --git a/receiver/memcachedreceiver/testdata/scraper/expected.yaml b/receiver/memcachedreceiver/testdata/scraper/expected.yaml index df9a58adba52..e578e267f9e5 100644 --- a/receiver/memcachedreceiver/testdata/scraper/expected.yaml +++ b/receiver/memcachedreceiver/testdata/scraper/expected.yaml @@ -6,7 +6,7 @@ resourceMetrics: gauge: dataPoints: - asInt: "15" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" name: memcached.bytes unit: By - description: Commands executed. @@ -19,25 +19,25 @@ resourceMetrics: - key: command value: stringValue: flush - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1111" attributes: - key: command value: stringValue: get - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1113" attributes: - key: command value: stringValue: set - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1114" attributes: - key: command value: stringValue: touch - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: '{commands}' - description: The current number of open connections. @@ -46,7 +46,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" unit: '{connections}' - description: Total number of connections opened since the server started running. name: memcached.connections.total @@ -54,7 +54,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: '{connections}' - description: Accumulated user and system time. @@ -67,13 +67,13 @@ resourceMetrics: - key: state value: stringValue: system - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asDouble: 11.11331119 attributes: - key: state value: stringValue: user - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: s - description: Number of items currently stored in the cache. @@ -82,7 +82,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1118" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" unit: '{items}' - description: Cache item evictions. name: memcached.evictions @@ -90,7 +90,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1126" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: '{evictions}' - description: Bytes transferred over the network. @@ -103,13 +103,13 @@ resourceMetrics: - key: direction value: stringValue: received - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "16" attributes: - key: direction value: stringValue: sent - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: by - description: Hit ratio for operations, expressed as a percentage value between 0.0 and 100.0. @@ -120,19 +120,19 @@ resourceMetrics: - key: operation value: stringValue: decrement - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asDouble: 50.02211410880142 attributes: - key: operation value: stringValue: get - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asDouble: 50.0220361392684 attributes: - key: operation value: stringValue: increment - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" name: memcached.operation_hit_ratio unit: '%' - description: Operation counts. @@ -148,7 +148,7 @@ resourceMetrics: - key: type value: stringValue: hit - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1120" attributes: - key: operation @@ -157,7 +157,7 @@ resourceMetrics: - key: type value: stringValue: miss - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1130" attributes: - key: operation @@ -166,7 +166,7 @@ resourceMetrics: - key: type value: stringValue: hit - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1131" attributes: - key: operation @@ -175,7 +175,7 @@ resourceMetrics: - key: type value: stringValue: miss - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1134" attributes: - key: operation @@ -184,7 +184,7 @@ resourceMetrics: - key: type value: stringValue: hit - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" - asInt: "1135" attributes: - key: operation @@ -193,7 +193,7 @@ resourceMetrics: - key: type value: stringValue: miss - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" isMonotonic: true unit: '{operations}' - description: Number of threads used by the memcached instance. @@ -202,7 +202,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - timeUnixNano: "1639770622333015000" + timeUnixNano: "1000000" unit: '{threads}' scope: name: otelcol/memcachedreceiver diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index baea8de15bbc..4e2866e08d52 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/google/go-cmp v0.5.9 - github.com/mongodb-forks/digest v1.0.4 + github.com/mongodb-forks/digest v1.0.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 @@ -56,7 +56,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 4e63c4b04e30..f5fb4657cce5 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -213,8 +213,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mongodb-forks/digest v1.0.4 h1:9FrGTc7MGAchgaQBcXBnEwUM/Oo8obW7OGWxnsSvZ64= -github.com/mongodb-forks/digest v1.0.4/go.mod h1:eHRfgovT+dvSFfltrOa27hy1oR/rcwyDdp5H1ZQxEMA= +github.com/mongodb-forks/digest v1.0.5 h1:EJu3wtLZcA0HCvsZpX5yuD193/sW9tHiNvrEM5apXMk= +github.com/mongodb-forks/digest v1.0.5/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= @@ -434,8 +434,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 6f5513281e7c..773cca9d227d 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -39,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 6874cca4fa2c..3d296376c6bc 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -141,8 +141,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/mongodbreceiver/testdata/scraper/expected.yaml b/receiver/mongodbreceiver/testdata/scraper/expected.yaml index ccd49fba9728..891f5a1c6a73 100644 --- a/receiver/mongodbreceiver/testdata/scraper/expected.yaml +++ b/receiver/mongodbreceiver/testdata/scraper/expected.yaml @@ -12,15 +12,15 @@ resourceMetrics: - key: type value: stringValue: hit - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "14" attributes: - key: type value: stringValue: miss - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The number of open cursors maintained for clients. @@ -29,8 +29,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{cursors}' - description: The number of cursors that have timed out. name: mongodb.cursor.timeout.count @@ -38,8 +38,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{cursors}' - description: The number of existing databases. name: mongodb.database.count @@ -47,8 +47,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{databases}' - description: The time the global lock has been held. name: mongodb.global_lock.time @@ -56,16 +56,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "58964" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: The health status of the server. gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1670996150941624000" - timeUnixNano: "1670996150945535000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: mongodb.health unit: "1" - description: The number of bytes received. @@ -74,8 +74,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3056" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of by transmitted. name: mongodb.network.io.transmit @@ -83,8 +83,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5393" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of requests received by the server. name: mongodb.network.request.count @@ -92,8 +92,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "20" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: The number of operations executed. name: mongodb.operation.count @@ -105,43 +105,43 @@ resourceMetrics: - key: operation value: stringValue: command - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: delete - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: getmore - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: insert - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: update - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The latency of operations. @@ -152,22 +152,22 @@ resourceMetrics: - key: operation value: stringValue: command - startTimeUnixNano: "1670911731284766000" - timeUnixNano: "1670911731288585000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: read - startTimeUnixNano: "1670911731284766000" - timeUnixNano: "1670911731288585000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: write - startTimeUnixNano: "1670911731284766000" - timeUnixNano: "1670911731288585000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: mongodb.operation.latency.time unit: us - description: The number of replicated operations executed. @@ -180,43 +180,43 @@ resourceMetrics: - key: operation value: stringValue: command - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: operation value: stringValue: delete - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: operation value: stringValue: getmore - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: operation value: stringValue: insert - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: operation value: stringValue: update - startTimeUnixNano: "1670911805821119000" - timeUnixNano: "1670911805825012000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operations}' - description: The total number of active sessions. @@ -225,8 +225,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19" - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{sessions}' - description: The amount of time that the server has been running. name: mongodb.uptime @@ -234,8 +234,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "58965" - startTimeUnixNano: "1670987956177006000" - timeUnixNano: "1670987956180933000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms scope: @@ -254,43 +254,43 @@ resourceMetrics: - key: operation value: stringValue: command - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3750" attributes: - key: operation value: stringValue: delete - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: operation value: stringValue: getmore - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12465" attributes: - key: operation value: stringValue: insert - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8907" attributes: - key: operation value: stringValue: query - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10117" attributes: - key: operation value: stringValue: update - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms scope: @@ -312,8 +312,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{accesses}' scope: name: otelcol/mongodbreceiver @@ -334,8 +334,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{accesses}' scope: name: otelcol/mongodbreceiver @@ -357,8 +357,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{collections}' - description: The number of connections. name: mongodb.connection.count @@ -373,8 +373,8 @@ resourceMetrics: - key: type value: stringValue: active - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "838857" attributes: - key: database @@ -383,8 +383,8 @@ resourceMetrics: - key: type value: stringValue: available - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: database @@ -393,8 +393,8 @@ resourceMetrics: - key: type value: stringValue: current - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: The size of the collection. Data compression does not affect this value. name: mongodb.data.size @@ -406,8 +406,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of document operations executed. name: mongodb.document.operation.count @@ -422,8 +422,8 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: database @@ -432,8 +432,8 @@ resourceMetrics: - key: operation value: stringValue: insert - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: database @@ -442,8 +442,8 @@ resourceMetrics: - key: operation value: stringValue: update - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{documents}' - description: The number of extents. name: mongodb.extent.count @@ -455,8 +455,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{extents}' - description: The number of indexes. name: mongodb.index.count @@ -468,8 +468,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{indexes}' - description: Sum of the space allocated to all indexes in the database, including free index space. name: mongodb.index.size @@ -481,8 +481,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The amount of memory used. name: mongodb.memory.usage @@ -497,8 +497,8 @@ resourceMetrics: - key: type value: stringValue: resident - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1141899264" attributes: - key: database @@ -507,8 +507,8 @@ resourceMetrics: - key: type value: stringValue: virtual - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of objects. name: mongodb.object.count @@ -520,8 +520,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{objects}' - description: The total amount of storage allocated to this collection. name: mongodb.storage.size @@ -533,8 +533,8 @@ resourceMetrics: - key: database value: stringValue: fakedatabase - startTimeUnixNano: "1659372940162070000" - timeUnixNano: "1659372940162165000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By scope: diff --git a/receiver/mongodbreceiver/testdata/scraper/partial_scrape.yaml b/receiver/mongodbreceiver/testdata/scraper/partial_scrape.yaml index 4583303b1519..040f9febd4f5 100644 --- a/receiver/mongodbreceiver/testdata/scraper/partial_scrape.yaml +++ b/receiver/mongodbreceiver/testdata/scraper/partial_scrape.yaml @@ -8,8 +8,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1660587887969146000" - timeUnixNano: "1660587887969460000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{databases}' scope: name: otelcol/mongodbreceiver diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index a2226ba37a3a..6c5089a65785 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -34,7 +34,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index aae681b5ecb2..b5b41be79be0 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -138,8 +138,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/mysqlreceiver/testdata/scraper/expected.yaml b/receiver/mysqlreceiver/testdata/scraper/expected.yaml index 197b0a29b274..cf80c085afe4 100644 --- a/receiver/mysqlreceiver/testdata/scraper/expected.yaml +++ b/receiver/mysqlreceiver/testdata/scraper/expected.yaml @@ -16,15 +16,15 @@ resourceMetrics: - key: status value: stringValue: clean - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "228" attributes: - key: status value: stringValue: dirty - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The configured size of the InnoDB buffer pool. name: mysql.buffer_pool.limit @@ -32,8 +32,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "134217728" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of operations on the InnoDB buffer pool. name: mysql.buffer_pool.operations @@ -45,50 +45,50 @@ resourceMetrics: - key: operation value: stringValue: read_ahead - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "238" attributes: - key: operation value: stringValue: read_ahead_evicted - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "236" attributes: - key: operation value: stringValue: read_ahead_rnd - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "239" attributes: - key: operation value: stringValue: read_requests - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "240" attributes: - key: operation value: stringValue: reads - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "241" attributes: - key: operation value: stringValue: wait_free - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "242" attributes: - key: operation value: stringValue: write_requests - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of requests to flush pages from the InnoDB buffer pool. @@ -97,8 +97,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "232" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of pages in the InnoDB buffer pool. @@ -111,22 +111,22 @@ resourceMetrics: - key: kind value: stringValue: data - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "233" attributes: - key: kind value: stringValue: free - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "234" attributes: - key: kind value: stringValue: misc - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of bytes in the InnoDB buffer pool. name: mysql.buffer_pool.usage @@ -138,15 +138,15 @@ resourceMetrics: - key: status value: stringValue: clean - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "229" attributes: - key: status value: stringValue: dirty - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of transmitted bytes between server and clients. name: mysql.client.network.io @@ -158,15 +158,15 @@ resourceMetrics: - key: kind value: stringValue: received - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: kind value: stringValue: sent - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of times each type of command has been executed. @@ -179,29 +179,29 @@ resourceMetrics: - key: command value: stringValue: delete - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "78" attributes: - key: command value: stringValue: insert - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "106" attributes: - key: command value: stringValue: select - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "173" attributes: - key: command value: stringValue: update - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of connection attempts (successful or not) to the MySQL server. @@ -210,8 +210,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "188" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Errors that occur during the client connection process. @@ -219,69 +219,69 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: + - asInt: "2" + attributes: + - key: error + value: + stringValue: aborted + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: error + value: + stringValue: aborted_clients + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "182" attributes: - key: error value: stringValue: accept - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "183" attributes: - key: error value: stringValue: internal - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "293" + attributes: + - key: error + value: + stringValue: locked + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "184" attributes: - key: error value: stringValue: max_connections - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "185" attributes: - key: error value: stringValue: peer_address - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "186" attributes: - key: error value: stringValue: select - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "187" attributes: - key: error value: stringValue: tcpwrap - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" - - asInt: "2" - attributes: - - key: error - value: - stringValue: aborted - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" - - asInt: "1" - attributes: - - key: error - value: - stringValue: aborted_clients - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" - - asInt: "293" - attributes: - - key: error - value: - stringValue: locked - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of writes to the InnoDB doublewrite buffer. @@ -294,15 +294,15 @@ resourceMetrics: - key: kind value: stringValue: pages_written - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "252" attributes: - key: kind value: stringValue: writes - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of requests to various MySQL handlers. @@ -315,127 +315,127 @@ resourceMetrics: - key: kind value: stringValue: commit - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "211" attributes: - key: kind value: stringValue: delete - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "212" attributes: - key: kind value: stringValue: discover - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "213" attributes: - key: kind value: stringValue: external_lock - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "214" attributes: - key: kind value: stringValue: mrr_init - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "215" attributes: - key: kind value: stringValue: prepare - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "216" attributes: - key: kind value: stringValue: read_first - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "217" attributes: - key: kind value: stringValue: read_key - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "218" attributes: - key: kind value: stringValue: read_last - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "219" attributes: - key: kind value: stringValue: read_next - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "220" attributes: - key: kind value: stringValue: read_prev - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "221" attributes: - key: kind value: stringValue: read_rnd - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "222" attributes: - key: kind value: stringValue: read_rnd_next - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "223" attributes: - key: kind value: stringValue: rollback - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "224" attributes: - key: kind value: stringValue: savepoint - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "225" attributes: - key: kind value: stringValue: savepoint_rollback - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "226" attributes: - key: kind value: stringValue: update - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "227" attributes: - key: kind value: stringValue: write - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The total count of I/O wait events for an index. @@ -457,8 +457,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: index @@ -473,8 +473,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: index @@ -489,8 +489,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: index @@ -505,8 +505,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The total time of I/O wait events for an index. @@ -528,8 +528,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "14" attributes: - key: index @@ -544,8 +544,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "15" attributes: - key: index @@ -560,8 +560,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "16" attributes: - key: index @@ -576,8 +576,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The number of joins that perform table scans. @@ -590,36 +590,36 @@ resourceMetrics: - key: kind value: stringValue: full - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "409" attributes: - key: kind value: stringValue: full_range - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "410" attributes: - key: kind value: stringValue: range - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "411" attributes: - key: kind value: stringValue: range_check - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "412" attributes: - key: kind value: stringValue: scan - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of MySQL locks. @@ -632,15 +632,15 @@ resourceMetrics: - key: kind value: stringValue: immediate - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "441" attributes: - key: kind value: stringValue: waited - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of InnoDB log operations. @@ -653,22 +653,22 @@ resourceMetrics: - key: operation value: stringValue: waits - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "254" attributes: - key: operation value: stringValue: write_requests - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "255" attributes: - key: operation value: stringValue: writes - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of mysqlx connections. @@ -681,22 +681,22 @@ resourceMetrics: - key: status value: stringValue: accepted - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "308" attributes: - key: status value: stringValue: closed - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "309" attributes: - key: status value: stringValue: rejected - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of worker threads available. @@ -709,15 +709,15 @@ resourceMetrics: - key: kind value: stringValue: active - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "363" attributes: - key: kind value: stringValue: available - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of opened resources. name: mysql.opened_resources @@ -729,22 +729,22 @@ resourceMetrics: - key: kind value: stringValue: file - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "373" attributes: - key: kind value: stringValue: table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "372" attributes: - key: kind value: stringValue: table_definition - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of InnoDB operations. @@ -757,22 +757,22 @@ resourceMetrics: - key: operation value: stringValue: fsyncs - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "248" attributes: - key: operation value: stringValue: reads - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "249" attributes: - key: operation value: stringValue: writes - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of InnoDB page operations. @@ -785,22 +785,22 @@ resourceMetrics: - key: operation value: stringValue: created - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "262" attributes: - key: operation value: stringValue: read - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "263" attributes: - key: operation value: stringValue: written - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of times each type of prepared statement command has been issued. @@ -813,43 +813,43 @@ resourceMetrics: - key: command value: stringValue: close - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "162" attributes: - key: command value: stringValue: execute - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "164" attributes: - key: command value: stringValue: fetch - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "165" attributes: - key: command value: stringValue: prepare - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "166" attributes: - key: command value: stringValue: reset - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "167" attributes: - key: command value: stringValue: send_long_data - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of statements executed by the server. This includes only statements sent to the server by clients. @@ -858,8 +858,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "407" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of statements executed by the server. @@ -868,8 +868,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "406" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of slow queries. @@ -878,8 +878,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "415" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of seconds that the replica must lag the source. @@ -888,8 +888,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "8" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: s - description: This field is an indication of how “late” the replica is. name: mysql.replica.time_behind_source @@ -897,8 +897,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: s - description: The number of InnoDB row locks. name: mysql.row_locks @@ -910,15 +910,15 @@ resourceMetrics: - key: kind value: stringValue: time - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "269" attributes: - key: kind value: stringValue: waits - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of InnoDB row operations. @@ -931,29 +931,29 @@ resourceMetrics: - key: operation value: stringValue: deleted - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "271" attributes: - key: operation value: stringValue: inserted - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "272" attributes: - key: operation value: stringValue: read - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "273" attributes: - key: operation value: stringValue: updated - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of MySQL sorts. @@ -966,29 +966,29 @@ resourceMetrics: - key: kind value: stringValue: merge_passes - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "417" attributes: - key: kind value: stringValue: range - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "418" attributes: - key: kind value: stringValue: rows - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "419" attributes: - key: kind value: stringValue: scan - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Summary of current and recent statement events. @@ -1010,8 +1010,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: digest @@ -1026,8 +1026,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: digest @@ -1042,8 +1042,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: digest @@ -1058,8 +1058,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: digest @@ -1074,8 +1074,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: digest @@ -1090,8 +1090,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: digest @@ -1106,8 +1106,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: digest @@ -1122,8 +1122,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: digest @@ -1138,8 +1138,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: digest @@ -1154,8 +1154,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The total wait time of the summarized timed events. name: mysql.statement_event.wait.time @@ -1173,8 +1173,8 @@ resourceMetrics: - key: schema value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: ns - description: The total count of I/O wait events for a table. name: mysql.table.io.wait.count @@ -1192,8 +1192,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: operation @@ -1205,8 +1205,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: operation @@ -1218,8 +1218,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: operation @@ -1231,8 +1231,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The total time of I/O wait events for a table. @@ -1251,8 +1251,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: operation @@ -1264,8 +1264,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: operation @@ -1277,8 +1277,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: operation @@ -1290,8 +1290,8 @@ resourceMetrics: - key: table value: stringValue: a_table - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ns - description: The total table lock wait read events. @@ -1310,8 +1310,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: kind @@ -1323,8 +1323,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: kind @@ -1336,8 +1336,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: kind @@ -1349,8 +1349,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: kind @@ -1362,8 +1362,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The total table lock wait read events times. name: mysql.table.lock_wait.read.time @@ -1381,8 +1381,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12" attributes: - key: kind @@ -1394,8 +1394,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "13" attributes: - key: kind @@ -1407,8 +1407,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: kind @@ -1420,8 +1420,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: kind @@ -1433,8 +1433,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: ns - description: The total table lock wait write events. name: mysql.table.lock_wait.write.count @@ -1452,8 +1452,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "6" attributes: - key: kind @@ -1465,8 +1465,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: kind @@ -1478,8 +1478,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: kind @@ -1491,8 +1491,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: kind @@ -1504,8 +1504,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The total table lock wait write events times. name: mysql.table.lock_wait.write.time @@ -1523,8 +1523,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "16" attributes: - key: kind @@ -1536,8 +1536,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: kind @@ -1549,8 +1549,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "17" attributes: - key: kind @@ -1562,8 +1562,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "18" attributes: - key: kind @@ -1575,8 +1575,8 @@ resourceMetrics: - key: table value: stringValue: otel - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: ns - description: The number of hits, misses or overflows for open tables cache lookups. name: mysql.table_open_cache @@ -1588,22 +1588,22 @@ resourceMetrics: - key: status value: stringValue: hit - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "443" attributes: - key: status value: stringValue: miss - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "444" attributes: - key: status value: stringValue: overflow - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The state of MySQL threads. @@ -1616,29 +1616,29 @@ resourceMetrics: - key: kind value: stringValue: cached - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "449" attributes: - key: kind value: stringValue: connected - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "450" attributes: - key: kind value: stringValue: created - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "451" attributes: - key: kind value: stringValue: running - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of created temporary resources. name: mysql.tmp_resources @@ -1650,22 +1650,22 @@ resourceMetrics: - key: resource value: stringValue: disk_tables - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "190" attributes: - key: resource value: stringValue: files - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "191" attributes: - key: resource value: stringValue: tables - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of seconds that the server has been up. @@ -1674,8 +1674,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "452" - startTimeUnixNano: "1644862687825728000" - timeUnixNano: "1644862687825772000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: s scope: diff --git a/receiver/mysqlreceiver/testdata/scraper/expected_partial.yaml b/receiver/mysqlreceiver/testdata/scraper/expected_partial.yaml index 1cb43d551a22..82bd5d6069f8 100644 --- a/receiver/mysqlreceiver/testdata/scraper/expected_partial.yaml +++ b/receiver/mysqlreceiver/testdata/scraper/expected_partial.yaml @@ -16,8 +16,8 @@ resourceMetrics: - key: kind value: stringValue: free - startTimeUnixNano: "1659981155092597000" - timeUnixNano: "1659981155092604000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/mysqlreceiver diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 49e5bd3c9a8c..0ccfe610cd15 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -40,7 +40,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 11c11c3c9cc9..2050d5e95d02 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -145,8 +145,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/nginxreceiver/testdata/scraper/expected.yaml b/receiver/nginxreceiver/testdata/scraper/expected.yaml index b56d0becda04..4bec8f12176b 100644 --- a/receiver/nginxreceiver/testdata/scraper/expected.yaml +++ b/receiver/nginxreceiver/testdata/scraper/expected.yaml @@ -8,7 +8,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16630948" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: connections - description: The current number of nginx connections by state @@ -21,25 +21,25 @@ resourceMetrics: - key: state value: stringValue: active - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "6" attributes: - key: state value: stringValue: reading - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "106" attributes: - key: state value: stringValue: waiting - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "179" attributes: - key: state value: stringValue: writing - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" unit: connections - description: The total number of handled connections. Generally, the parameter value is the same as nginx.connections_accepted unless some resource limits have been reached (for example, the worker_connections limit). name: nginx.connections_handled @@ -47,7 +47,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16630946" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: connections - description: Total number of requests made to the server since it started @@ -56,7 +56,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "31070465" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: requests scope: diff --git a/receiver/nginxreceiver/testdata/scraper/expected_with_connections_as_gauge.yaml b/receiver/nginxreceiver/testdata/scraper/expected_with_connections_as_gauge.yaml index 0d523ba95e6c..458e7e7df43a 100644 --- a/receiver/nginxreceiver/testdata/scraper/expected_with_connections_as_gauge.yaml +++ b/receiver/nginxreceiver/testdata/scraper/expected_with_connections_as_gauge.yaml @@ -8,7 +8,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16630948" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: connections - description: The current number of nginx connections by state @@ -19,25 +19,25 @@ resourceMetrics: - key: state value: stringValue: active - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "6" attributes: - key: state value: stringValue: reading - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "106" attributes: - key: state value: stringValue: waiting - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" - asInt: "179" attributes: - key: state value: stringValue: writing - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" name: nginx.connections_current unit: connections - description: The total number of handled connections. Generally, the parameter value is the same as nginx.connections_accepted unless some resource limits have been reached (for example, the worker_connections limit). @@ -46,7 +46,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "16630946" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: connections - description: Total number of requests made to the server since it started @@ -55,7 +55,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "31070465" - timeUnixNano: "1638471548185885000" + timeUnixNano: "1000000" isMonotonic: true unit: requests scope: diff --git a/receiver/nsxtreceiver/testdata/metrics/expected_metrics.yaml b/receiver/nsxtreceiver/testdata/metrics/expected_metrics.yaml index 34cb5575fa5e..5eff7b37dab2 100644 --- a/receiver/nsxtreceiver/testdata/metrics/expected_metrics.yaml +++ b/receiver/nsxtreceiver/testdata/metrics/expected_metrics.yaml @@ -20,15 +20,15 @@ resourceMetrics: - key: class value: stringValue: datapath - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asDouble: 4.34 attributes: - key: class value: stringValue: services - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.cpu.utilization unit: '%' - description: The amount of storage space used by the node. @@ -41,22 +41,22 @@ resourceMetrics: - key: state value: stringValue: available - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The percentage of storage space utilized. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.filesystem.utilization unit: '%' - description: The size of the node's memory cache. @@ -65,8 +65,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy - description: The memory usage of the node. name: nsxt.node.memory.usage @@ -74,8 +74,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "89169108" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy scope: name: otelcol/nsxtreceiver @@ -101,15 +101,15 @@ resourceMetrics: - key: class value: stringValue: datapath - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asDouble: 0 attributes: - key: class value: stringValue: services - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.cpu.utilization unit: '%' - description: The amount of storage space used by the node. @@ -122,22 +122,22 @@ resourceMetrics: - key: state value: stringValue: available - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26168032" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The percentage of storage space utilized. gauge: dataPoints: - asDouble: 0.09942935492936687 - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.filesystem.utilization unit: '%' - description: The size of the node's memory cache. @@ -146,8 +146,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1716556" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy - description: The memory usage of the node. name: nsxt.node.memory.usage @@ -155,8 +155,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "19636300" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy scope: name: otelcol/nsxtreceiver @@ -182,15 +182,15 @@ resourceMetrics: - key: class value: stringValue: datapath - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asDouble: 4.34 attributes: - key: class value: stringValue: services - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.cpu.utilization unit: '%' - description: The amount of storage space used by the node. @@ -203,22 +203,22 @@ resourceMetrics: - key: state value: stringValue: available - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The percentage of storage space utilized. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: nsxt.node.filesystem.utilization unit: '%' - description: The size of the node's memory cache. @@ -227,8 +227,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "234" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy - description: The memory usage of the node. name: nsxt.node.memory.usage @@ -236,8 +236,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "143728936" - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KBy scope: name: otelcol/nsxtreceiver @@ -268,15 +268,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5877910030884" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -292,8 +292,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -302,8 +302,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12483778397" attributes: - key: direction @@ -312,8 +312,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -322,8 +322,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -332,8 +332,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12313320048" attributes: - key: direction @@ -342,8 +342,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: @@ -375,15 +375,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5877910030884" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -399,8 +399,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -409,8 +409,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12483778397" attributes: - key: direction @@ -419,8 +419,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -429,8 +429,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -439,8 +439,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "12313320048" attributes: - key: direction @@ -449,8 +449,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: @@ -482,15 +482,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -506,8 +506,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -516,8 +516,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "63594238" attributes: - key: direction @@ -526,8 +526,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -536,8 +536,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -546,8 +546,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -556,8 +556,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: @@ -589,15 +589,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -613,8 +613,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -623,8 +623,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "63594238" attributes: - key: direction @@ -633,8 +633,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -643,8 +643,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -653,8 +653,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -663,8 +663,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: @@ -696,15 +696,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -720,8 +720,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -730,8 +730,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "63594238" attributes: - key: direction @@ -740,8 +740,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -750,8 +750,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -760,8 +760,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -770,8 +770,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: @@ -803,15 +803,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: By - description: The number of packets which have flowed through the network interface on the node. @@ -827,8 +827,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -837,8 +837,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "63594238" attributes: - key: direction @@ -847,8 +847,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -857,8 +857,8 @@ resourceMetrics: - key: type value: stringValue: dropped - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -867,8 +867,8 @@ resourceMetrics: - key: type value: stringValue: errored - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -877,8 +877,8 @@ resourceMetrics: - key: type value: stringValue: success - startTimeUnixNano: "1652365826688352000" - timeUnixNano: "1652365826697632000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' scope: diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 06889eb2b5bc..d194dc47739f 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -21,10 +21,10 @@ require ( go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/sdk v1.17.0 + go.opentelemetry.io/otel/trace v1.17.0 google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 ) @@ -74,7 +74,7 @@ require ( go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/collector/semconv v0.83.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.25.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index f51f146d58c5..a81c1898ae71 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -435,20 +435,20 @@ go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8a go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 76f084044149..aae5728ac239 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -4,15 +4,15 @@ go 1.20 require ( github.com/google/go-cmp v0.5.9 - github.com/sijms/go-ora/v2 v2.7.11 + github.com/sijms/go-ora/v2 v2.7.15 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.83.0 go.opentelemetry.io/collector/confmap v0.83.0 go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 - go.opentelemetry.io/otel/metric v1.16.0 - go.opentelemetry.io/otel/trace v1.16.0 + go.opentelemetry.io/otel/metric v1.17.0 + go.opentelemetry.io/otel/trace v1.17.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.25.0 ) @@ -36,7 +36,7 @@ require ( go.opentelemetry.io/collector/exporter v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index c6caf0b85d4b..df3243a73ab3 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -243,8 +243,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sijms/go-ora/v2 v2.7.11 h1:RqyIXtTyIavMfQWAB/pRPbCo3m9daS4ks7sHzWSweaA= -github.com/sijms/go-ora/v2 v2.7.11/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.7.15 h1:39rGXS0lC3RzxcrlmfkrBAHzD6OKF+m3RI7VIyht6Ds= +github.com/sijms/go-ora/v2 v2.7.15/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= @@ -291,15 +291,15 @@ go.opentelemetry.io/collector/processor v0.83.0 h1:oWMpPzHLkzlPXRIa27UsfsaDSbXaF go.opentelemetry.io/collector/processor v0.83.0/go.mod h1:sLxTTqkIhmNtekO0HebXgVclPpm/xoQ4+g8CbzgYBCM= go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/receiver/otlpjsonfilereceiver/file_test.go b/receiver/otlpjsonfilereceiver/file_test.go index ef0d26741ccf..053946ae927b 100644 --- a/receiver/otlpjsonfilereceiver/file_test.go +++ b/receiver/otlpjsonfilereceiver/file_test.go @@ -24,7 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/helper" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/tokenize" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver/internal/metadata" ) @@ -51,11 +51,12 @@ func TestFileTracesReceiver(t *testing.T) { marshaler := &ptrace.JSONMarshaler{} b, err := marshaler.MarshalTraces(td) assert.NoError(t, err) + b = append(b, '\n') err = os.WriteFile(filepath.Join(tempFolder, "traces.json"), b, 0600) assert.NoError(t, err) time.Sleep(1 * time.Second) - require.Len(t, sink.AllTraces(), 1) + require.Len(t, sink.AllTraces(), 1) assert.EqualValues(t, td, sink.AllTraces()[0]) err = receiver.Shutdown(context.Background()) assert.NoError(t, err) @@ -77,6 +78,7 @@ func TestFileMetricsReceiver(t *testing.T) { marshaler := &pmetric.JSONMarshaler{} b, err := marshaler.MarshalMetrics(md) assert.NoError(t, err) + b = append(b, '\n') err = os.WriteFile(filepath.Join(tempFolder, "metrics.json"), b, 0600) assert.NoError(t, err) time.Sleep(1 * time.Second) @@ -103,6 +105,7 @@ func TestFileLogsReceiver(t *testing.T) { marshaler := &plog.JSONMarshaler{} b, err := marshaler.MarshalLogs(ld) assert.NoError(t, err) + b = append(b, '\n') err = os.WriteFile(filepath.Join(tempFolder, "logs.json"), b, 0600) assert.NoError(t, err) time.Sleep(1 * time.Second) @@ -121,7 +124,7 @@ func testdataConfigYamlAsMap() *Config { IncludeFileNameResolved: false, IncludeFilePathResolved: false, PollInterval: 200 * time.Millisecond, - Splitter: helper.NewSplitterConfig(), + Splitter: tokenize.NewSplitterConfig(), StartAt: "end", FingerprintSize: 1000, MaxLogSize: 1024 * 1024, @@ -186,6 +189,7 @@ func TestFileMixedSignals(t *testing.T) { b = append(b, b2...) b = append(b, '\n') b = append(b, b3...) + b = append(b, '\n') err = os.WriteFile(filepath.Join(tempFolder, "metrics.json"), b, 0600) assert.NoError(t, err) time.Sleep(1 * time.Second) diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 25c4845f07ae..d1eabdd18e4d 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -45,7 +45,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 19bb3d39fd2a..549dd9b9f31c 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -420,8 +420,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index c02395212ed5..43f3364a0923 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -5,7 +5,6 @@ package podmanreceiver // import "github.com/open-telemetry/opentelemetry-collec import ( "errors" - "time" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configopaque" @@ -20,9 +19,6 @@ type Config struct { // The URL of the podman server. Default is "unix:///run/podman/podman.sock" Endpoint string `mapstructure:"endpoint"` - // The maximum amount of time to wait for Podman API responses. Default is 5s - Timeout time.Duration `mapstructure:"timeout"` - APIVersion string `mapstructure:"api_version"` SSHKey string `mapstructure:"ssh_key"` SSHPassphrase configopaque.String `mapstructure:"ssh_passphrase"` diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index a72dcd819e91..458d1c7ab8d8 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -38,7 +38,6 @@ func TestLoadConfig(t *testing.T) { }, APIVersion: defaultAPIVersion, Endpoint: "unix:///run/podman/podman.sock", - Timeout: 5 * time.Second, }, }, { @@ -51,7 +50,6 @@ func TestLoadConfig(t *testing.T) { }, APIVersion: defaultAPIVersion, Endpoint: "http://example.com/", - Timeout: 20 * time.Second, }, }, } diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 62ea5dbfb997..9bb390983f55 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -34,7 +34,6 @@ func createDefaultConfig() *Config { return &Config{ ScraperControllerSettings: cfg, Endpoint: "unix:///run/podman/podman.sock", - Timeout: 5 * time.Second, APIVersion: defaultAPIVersion, } } diff --git a/receiver/podmanreceiver/libpod_client_test.go b/receiver/podmanreceiver/libpod_client_test.go index 2a41e8dbc04c..3583f909b7d0 100644 --- a/receiver/podmanreceiver/libpod_client_test.go +++ b/receiver/podmanreceiver/libpod_client_test.go @@ -62,8 +62,6 @@ func TestStats(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - // default timeout - Timeout: 5 * time.Second, } cli, err := newLibpodClient(zap.NewNop(), config) @@ -120,8 +118,6 @@ func TestStatsError(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - // default timeout - Timeout: 5 * time.Second, } cli, err := newLibpodClient(zap.NewNop(), config) @@ -156,8 +152,6 @@ func TestList(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - // default timeout - Timeout: 5 * time.Second, } cli, err := newLibpodClient(zap.NewNop(), config) @@ -229,8 +223,6 @@ func TestEvents(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - // default timeout - Timeout: 5 * time.Second, } cli, err := newLibpodClient(zap.NewNop(), config) diff --git a/receiver/podmanreceiver/podman.go b/receiver/podmanreceiver/podman.go index d43dbc11c600..db4218be7b18 100644 --- a/receiver/podmanreceiver/podman.go +++ b/receiver/podmanreceiver/podman.go @@ -151,9 +151,9 @@ func (pc *ContainerScraper) inspectAndPersistContainer(ctx context.Context, cid return nil, false } params.Add("filters", string(jsonFilter)) - listCtx, cancel := context.WithTimeout(ctx, pc.config.Timeout) + inspectCtx, cancel := context.WithTimeout(ctx, pc.config.Timeout) defer cancel() - container, err := pc.client.list(listCtx, params) + container, err := pc.client.list(inspectCtx, params) if len(container) == 1 && err == nil { pc.persistContainer(container[0]) return &container[0], true @@ -172,9 +172,7 @@ func (pc *ContainerScraper) fetchContainerStats(ctx context.Context, c container params.Add("stream", "false") params.Add("containers", c.ID) - statsCtx, cancel := context.WithTimeout(ctx, pc.config.Timeout) - defer cancel() - stats, err := pc.client.stats(statsCtx, params) + stats, err := pc.client.stats(ctx, params) if err != nil || len(stats) < 1 { return containerStats{}, err } diff --git a/receiver/podmanreceiver/podman_test.go b/receiver/podmanreceiver/podman_test.go index 276df4506bf3..be711bed8725 100644 --- a/receiver/podmanreceiver/podman_test.go +++ b/receiver/podmanreceiver/podman_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" @@ -70,7 +71,9 @@ func TestWatchingTimeouts(t *testing.T) { config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - Timeout: 50 * time.Millisecond, + ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + Timeout: 50 * time.Millisecond, + }, } client, err := newLibpodClient(zap.NewNop(), config) @@ -86,7 +89,10 @@ func TestWatchingTimeouts(t *testing.T) { err = cli.loadContainerList(context.Background()) require.Error(t, err) - container, err := cli.fetchContainerStats(context.Background(), container{}) + ctx, fetchCancel := context.WithTimeout(context.Background(), config.Timeout) + defer fetchCancel() + + container, err := cli.fetchContainerStats(ctx, container{}) require.Error(t, err) assert.Contains(t, err.Error(), expectedError) assert.Empty(t, container) @@ -118,7 +124,9 @@ func TestEventLoopHandlesError(t *testing.T) { observed, logs := observer.New(zapcore.WarnLevel) config := &Config{ Endpoint: fmt.Sprintf("unix://%s", addr), - Timeout: 50 * time.Millisecond, + ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + Timeout: 50 * time.Millisecond, + }, } client, err := newLibpodClient(zap.NewNop(), config) diff --git a/receiver/postgresqlreceiver/client.go b/receiver/postgresqlreceiver/client.go index ac2c85871817..9b3546c42dce 100644 --- a/receiver/postgresqlreceiver/client.go +++ b/receiver/postgresqlreceiver/client.go @@ -132,10 +132,11 @@ type databaseStats struct { transactionCommitted int64 transactionRollback int64 deadlocks int64 + tempFiles int64 } func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []string) (map[databaseName]databaseStats, error) { - query := filterQueryByDatabases("SELECT datname, xact_commit, xact_rollback, deadlocks FROM pg_stat_database", databases, false) + query := filterQueryByDatabases("SELECT datname, xact_commit, xact_rollback, deadlocks, temp_files FROM pg_stat_database", databases, false) rows, err := c.client.QueryContext(ctx, query) if err != nil { return nil, err @@ -144,8 +145,8 @@ func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []str dbStats := map[databaseName]databaseStats{} for rows.Next() { var datname string - var transactionCommitted, transactionRollback, deadlocks int64 - err = rows.Scan(&datname, &transactionCommitted, &transactionRollback, &deadlocks) + var transactionCommitted, transactionRollback, deadlocks, tempFiles int64 + err = rows.Scan(&datname, &transactionCommitted, &transactionRollback, &deadlocks, &tempFiles) if err != nil { errs = multierr.Append(errs, err) continue @@ -155,6 +156,7 @@ func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []str transactionCommitted: transactionCommitted, transactionRollback: transactionRollback, deadlocks: deadlocks, + tempFiles: tempFiles, } } } diff --git a/receiver/postgresqlreceiver/documentation.md b/receiver/postgresqlreceiver/documentation.md index 0bf06a9c41d7..8304b1b5f7ae 100644 --- a/receiver/postgresqlreceiver/documentation.md +++ b/receiver/postgresqlreceiver/documentation.md @@ -261,6 +261,14 @@ The number of deadlocks. | ---- | ----------- | ---------- | ----------------------- | --------- | | {deadlock} | Sum | Int | Cumulative | true | +### postgresql.temp_files + +The number of temp files. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {temp_file} | Sum | Int | Cumulative | true | + ## Resource Attributes | Name | Description | Values | Enabled | diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 015c638d0e8f..c501c0862b12 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -37,7 +37,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 7559355eafdc..f11a9d0d95dc 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -138,8 +138,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/postgresqlreceiver/integration_test.go b/receiver/postgresqlreceiver/integration_test.go index c965384ace1e..4e80998d53c6 100644 --- a/receiver/postgresqlreceiver/integration_test.go +++ b/receiver/postgresqlreceiver/integration_test.go @@ -59,6 +59,7 @@ func integrationTest(name string, databases []string) func(*testing.T) { rCfg.Password = "otelp" rCfg.Insecure = true rCfg.Metrics.PostgresqlDeadlocks.Enabled = true + rCfg.Metrics.PostgresqlTempFiles.Enabled = true }), scraperinttest.WithExpectedFile(expectedFile), scraperinttest.WithCompareOptions( diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_config.go b/receiver/postgresqlreceiver/internal/metadata/generated_config.go index c5643a772702..331d5ece8c6f 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_config.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_config.go @@ -46,6 +46,7 @@ type MetricsConfig struct { PostgresqlTableCount MetricConfig `mapstructure:"postgresql.table.count"` PostgresqlTableSize MetricConfig `mapstructure:"postgresql.table.size"` PostgresqlTableVacuumCount MetricConfig `mapstructure:"postgresql.table.vacuum.count"` + PostgresqlTempFiles MetricConfig `mapstructure:"postgresql.temp_files"` PostgresqlWalAge MetricConfig `mapstructure:"postgresql.wal.age"` PostgresqlWalLag MetricConfig `mapstructure:"postgresql.wal.lag"` } @@ -115,6 +116,9 @@ func DefaultMetricsConfig() MetricsConfig { PostgresqlTableVacuumCount: MetricConfig{ Enabled: true, }, + PostgresqlTempFiles: MetricConfig{ + Enabled: false, + }, PostgresqlWalAge: MetricConfig{ Enabled: true, }, diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_config_test.go b/receiver/postgresqlreceiver/internal/metadata/generated_config_test.go index 44317131d3fc..d0d3bd078135 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_config_test.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_config_test.go @@ -47,6 +47,7 @@ func TestMetricsBuilderConfig(t *testing.T) { PostgresqlTableCount: MetricConfig{Enabled: true}, PostgresqlTableSize: MetricConfig{Enabled: true}, PostgresqlTableVacuumCount: MetricConfig{Enabled: true}, + PostgresqlTempFiles: MetricConfig{Enabled: true}, PostgresqlWalAge: MetricConfig{Enabled: true}, PostgresqlWalLag: MetricConfig{Enabled: true}, }, @@ -82,6 +83,7 @@ func TestMetricsBuilderConfig(t *testing.T) { PostgresqlTableCount: MetricConfig{Enabled: false}, PostgresqlTableSize: MetricConfig{Enabled: false}, PostgresqlTableVacuumCount: MetricConfig{Enabled: false}, + PostgresqlTempFiles: MetricConfig{Enabled: false}, PostgresqlWalAge: MetricConfig{Enabled: false}, PostgresqlWalLag: MetricConfig{Enabled: false}, }, diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go index 33111225a22c..9d2850705804 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go @@ -1316,6 +1316,57 @@ func newMetricPostgresqlTableVacuumCount(cfg MetricConfig) metricPostgresqlTable return m } +type metricPostgresqlTempFiles struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills postgresql.temp_files metric with initial data. +func (m *metricPostgresqlTempFiles) init() { + m.data.SetName("postgresql.temp_files") + m.data.SetDescription("The number of temp files.") + m.data.SetUnit("{temp_file}") + m.data.SetEmptySum() + m.data.Sum().SetIsMonotonic(true) + m.data.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) +} + +func (m *metricPostgresqlTempFiles) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Sum().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricPostgresqlTempFiles) updateCapacity() { + if m.data.Sum().DataPoints().Len() > m.capacity { + m.capacity = m.data.Sum().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricPostgresqlTempFiles) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Sum().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricPostgresqlTempFiles(cfg MetricConfig) metricPostgresqlTempFiles { + m := metricPostgresqlTempFiles{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + type metricPostgresqlWalAge struct { data pmetric.Metric // data buffer for generated metric. config MetricConfig // metric config provided by user. @@ -1446,6 +1497,7 @@ type MetricsBuilder struct { metricPostgresqlTableCount metricPostgresqlTableCount metricPostgresqlTableSize metricPostgresqlTableSize metricPostgresqlTableVacuumCount metricPostgresqlTableVacuumCount + metricPostgresqlTempFiles metricPostgresqlTempFiles metricPostgresqlWalAge metricPostgresqlWalAge metricPostgresqlWalLag metricPostgresqlWalLag } @@ -1487,6 +1539,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting metricPostgresqlTableCount: newMetricPostgresqlTableCount(mbc.Metrics.PostgresqlTableCount), metricPostgresqlTableSize: newMetricPostgresqlTableSize(mbc.Metrics.PostgresqlTableSize), metricPostgresqlTableVacuumCount: newMetricPostgresqlTableVacuumCount(mbc.Metrics.PostgresqlTableVacuumCount), + metricPostgresqlTempFiles: newMetricPostgresqlTempFiles(mbc.Metrics.PostgresqlTempFiles), metricPostgresqlWalAge: newMetricPostgresqlWalAge(mbc.Metrics.PostgresqlWalAge), metricPostgresqlWalLag: newMetricPostgresqlWalLag(mbc.Metrics.PostgresqlWalLag), } @@ -1571,6 +1624,7 @@ func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { mb.metricPostgresqlTableCount.emit(ils.Metrics()) mb.metricPostgresqlTableSize.emit(ils.Metrics()) mb.metricPostgresqlTableVacuumCount.emit(ils.Metrics()) + mb.metricPostgresqlTempFiles.emit(ils.Metrics()) mb.metricPostgresqlWalAge.emit(ils.Metrics()) mb.metricPostgresqlWalLag.emit(ils.Metrics()) @@ -1698,6 +1752,11 @@ func (mb *MetricsBuilder) RecordPostgresqlTableVacuumCountDataPoint(ts pcommon.T mb.metricPostgresqlTableVacuumCount.recordDataPoint(mb.startTime, ts, val) } +// RecordPostgresqlTempFilesDataPoint adds a data point to postgresql.temp_files metric. +func (mb *MetricsBuilder) RecordPostgresqlTempFilesDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricPostgresqlTempFiles.recordDataPoint(mb.startTime, ts, val) +} + // RecordPostgresqlWalAgeDataPoint adds a data point to postgresql.wal.age metric. func (mb *MetricsBuilder) RecordPostgresqlWalAgeDataPoint(ts pcommon.Timestamp, val int64) { mb.metricPostgresqlWalAge.recordDataPoint(mb.startTime, ts, val) diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go index 934516024fb2..1b55400a6a7a 100644 --- a/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/postgresqlreceiver/internal/metadata/generated_metrics_test.go @@ -137,6 +137,9 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordPostgresqlTableVacuumCountDataPoint(ts, 1) + allMetricsCount++ + mb.RecordPostgresqlTempFilesDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordPostgresqlWalAgeDataPoint(ts, 1) @@ -480,6 +483,20 @@ func TestMetricsBuilder(t *testing.T) { assert.Equal(t, ts, dp.Timestamp()) assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) assert.Equal(t, int64(1), dp.IntValue()) + case "postgresql.temp_files": + assert.False(t, validatedMetrics["postgresql.temp_files"], "Found a duplicate in the metrics slice: postgresql.temp_files") + validatedMetrics["postgresql.temp_files"] = true + assert.Equal(t, pmetric.MetricTypeSum, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Sum().DataPoints().Len()) + assert.Equal(t, "The number of temp files.", ms.At(i).Description()) + assert.Equal(t, "{temp_file}", ms.At(i).Unit()) + assert.Equal(t, true, ms.At(i).Sum().IsMonotonic()) + assert.Equal(t, pmetric.AggregationTemporalityCumulative, ms.At(i).Sum().AggregationTemporality()) + dp := ms.At(i).Sum().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) case "postgresql.wal.age": assert.False(t, validatedMetrics["postgresql.wal.age"], "Found a duplicate in the metrics slice: postgresql.wal.age") validatedMetrics["postgresql.wal.age"] = true diff --git a/receiver/postgresqlreceiver/internal/metadata/testdata/config.yaml b/receiver/postgresqlreceiver/internal/metadata/testdata/config.yaml index d82b665b4a51..5a8a1e83f76e 100644 --- a/receiver/postgresqlreceiver/internal/metadata/testdata/config.yaml +++ b/receiver/postgresqlreceiver/internal/metadata/testdata/config.yaml @@ -43,6 +43,8 @@ all_set: enabled: true postgresql.table.vacuum.count: enabled: true + postgresql.temp_files: + enabled: true postgresql.wal.age: enabled: true postgresql.wal.lag: @@ -98,6 +100,8 @@ none_set: enabled: false postgresql.table.vacuum.count: enabled: false + postgresql.temp_files: + enabled: false postgresql.wal.age: enabled: false postgresql.wal.lag: diff --git a/receiver/postgresqlreceiver/metadata.yaml b/receiver/postgresqlreceiver/metadata.yaml index f27da4640262..19c85f9e5252 100644 --- a/receiver/postgresqlreceiver/metadata.yaml +++ b/receiver/postgresqlreceiver/metadata.yaml @@ -248,6 +248,14 @@ metrics: aggregation_temporality: cumulative monotonic: true value_type: int + postgresql.temp_files: + enabled: false + description: The number of temp files. + unit: "{temp_file}" + sum: + value_type: int + monotonic: true + aggregation_temporality: cumulative postgresql.wal.age: description: Age of the oldest WAL file. extended_documentation: | diff --git a/receiver/postgresqlreceiver/scraper.go b/receiver/postgresqlreceiver/scraper.go index 224f2f86871b..5bb81227567c 100644 --- a/receiver/postgresqlreceiver/scraper.go +++ b/receiver/postgresqlreceiver/scraper.go @@ -166,6 +166,7 @@ func (p *postgreSQLScraper) recordDatabase(now pcommon.Timestamp, db string, r * p.mb.RecordPostgresqlCommitsDataPoint(now, stats.transactionCommitted) p.mb.RecordPostgresqlRollbacksDataPoint(now, stats.transactionRollback) p.mb.RecordPostgresqlDeadlocksDataPoint(now, stats.deadlocks) + p.mb.RecordPostgresqlTempFilesDataPoint(now, stats.tempFiles) } rb := p.mb.NewResourceBuilder() rb.SetPostgresqlDatabaseName(db) diff --git a/receiver/postgresqlreceiver/scraper_test.go b/receiver/postgresqlreceiver/scraper_test.go index 27b1040ee627..15262feb8b81 100644 --- a/receiver/postgresqlreceiver/scraper_test.go +++ b/receiver/postgresqlreceiver/scraper_test.go @@ -38,6 +38,7 @@ func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Databases = []string{"otel"} cfg.Metrics.PostgresqlDeadlocks.Enabled = true + cfg.Metrics.PostgresqlTempFiles.Enabled = true scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, factory) actualMetrics, err := scraper.scrape(context.Background()) @@ -56,7 +57,10 @@ func TestScraperNoDatabaseSingle(t *testing.T) { factory.initMocks([]string{"otel"}) cfg := createDefaultConfig().(*Config) + require.True(t, cfg.Metrics.PostgresqlDeadlocks.Enabled == false) cfg.Metrics.PostgresqlDeadlocks.Enabled = true + require.True(t, cfg.Metrics.PostgresqlTempFiles.Enabled == false) + cfg.Metrics.PostgresqlTempFiles.Enabled = true scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, factory) actualMetrics, err := scraper.scrape(context.Background()) @@ -68,6 +72,21 @@ func TestScraperNoDatabaseSingle(t *testing.T) { require.NoError(t, pmetrictest.CompareMetrics(expectedMetrics, actualMetrics, pmetrictest.IgnoreResourceMetricsOrder(), pmetrictest.IgnoreMetricDataPointsOrder(), pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreTimestamp())) + + cfg.Metrics.PostgresqlDeadlocks.Enabled = false + cfg.Metrics.PostgresqlTempFiles.Enabled = false + + scraper = newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, factory) + actualMetrics, err = scraper.scrape(context.Background()) + require.NoError(t, err) + + expectedFile = filepath.Join("testdata", "scraper", "otel", "expected_default_metrics.yaml") + expectedMetrics, err = golden.ReadMetrics(expectedFile) + require.NoError(t, err) + + require.NoError(t, pmetrictest.CompareMetrics(expectedMetrics, actualMetrics, pmetrictest.IgnoreResourceMetricsOrder(), + pmetrictest.IgnoreMetricDataPointsOrder(), pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreTimestamp())) + } func TestScraperNoDatabaseMultiple(t *testing.T) { @@ -75,7 +94,10 @@ func TestScraperNoDatabaseMultiple(t *testing.T) { factory.initMocks([]string{"otel", "open", "telemetry"}) cfg := createDefaultConfig().(*Config) + require.True(t, cfg.Metrics.PostgresqlDeadlocks.Enabled == false) cfg.Metrics.PostgresqlDeadlocks.Enabled = true + require.True(t, cfg.Metrics.PostgresqlTempFiles.Enabled == false) + cfg.Metrics.PostgresqlTempFiles.Enabled = true scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) actualMetrics, err := scraper.scrape(context.Background()) @@ -94,7 +116,10 @@ func TestScraperWithResourceAttributeFeatureGate(t *testing.T) { factory.initMocks([]string{"otel", "open", "telemetry"}) cfg := createDefaultConfig().(*Config) + require.True(t, cfg.Metrics.PostgresqlDeadlocks.Enabled == false) cfg.Metrics.PostgresqlDeadlocks.Enabled = true + require.True(t, cfg.Metrics.PostgresqlTempFiles.Enabled == false) + cfg.Metrics.PostgresqlTempFiles.Enabled = true scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) actualMetrics, err := scraper.scrape(context.Background()) @@ -113,7 +138,10 @@ func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) { factory.initMocks([]string{"otel"}) cfg := createDefaultConfig().(*Config) + require.True(t, cfg.Metrics.PostgresqlDeadlocks.Enabled == false) cfg.Metrics.PostgresqlDeadlocks.Enabled = true + require.True(t, cfg.Metrics.PostgresqlTempFiles.Enabled == false) + cfg.Metrics.PostgresqlTempFiles.Enabled = true scraper := newPostgreSQLScraper(receivertest.NewNopCreateSettings(), cfg, &factory) actualMetrics, err := scraper.scrape(context.Background()) @@ -224,6 +252,7 @@ func (m *mockClient) initMocks(database string, databases []string, index int) { transactionCommitted: int64(idx + 1), transactionRollback: int64(idx + 2), deadlocks: int64(idx + 3), + tempFiles: int64(idx + 4), } dbSize[databaseName(db)] = int64(idx + 4) backends[databaseName(db)] = int64(idx + 3) diff --git a/receiver/postgresqlreceiver/testdata/integration/expected_all_db.yaml b/receiver/postgresqlreceiver/testdata/integration/expected_all_db.yaml index 49733b5e9d92..4160b217356c 100644 --- a/receiver/postgresqlreceiver/testdata/integration/expected_all_db.yaml +++ b/receiver/postgresqlreceiver/testdata/integration/expected_all_db.yaml @@ -175,6 +175,16 @@ resourceMetrics: startTimeUnixNano: "1687780273472170000" timeUnixNano: "1687780274490198000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780273472170000" + timeUnixNano: "1687780274490198000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest @@ -233,6 +243,16 @@ resourceMetrics: startTimeUnixNano: "1687780273472170000" timeUnixNano: "1687780274490198000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780273472170000" + timeUnixNano: "1687780274490198000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest @@ -300,6 +320,16 @@ resourceMetrics: startTimeUnixNano: "1687780273472170000" timeUnixNano: "1687780274490198000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780273472170000" + timeUnixNano: "1687780274490198000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest diff --git a/receiver/postgresqlreceiver/testdata/integration/expected_multi_db.yaml b/receiver/postgresqlreceiver/testdata/integration/expected_multi_db.yaml index b3dfb861ebc4..5577b153ab4b 100644 --- a/receiver/postgresqlreceiver/testdata/integration/expected_multi_db.yaml +++ b/receiver/postgresqlreceiver/testdata/integration/expected_multi_db.yaml @@ -175,6 +175,16 @@ resourceMetrics: startTimeUnixNano: "1687780262696586000" timeUnixNano: "1687780263696969000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780262696586000" + timeUnixNano: "1687780263696969000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest @@ -233,6 +243,16 @@ resourceMetrics: startTimeUnixNano: "1687780262696586000" timeUnixNano: "1687780263696969000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780262696586000" + timeUnixNano: "1687780263696969000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest diff --git a/receiver/postgresqlreceiver/testdata/integration/expected_single_db.yaml b/receiver/postgresqlreceiver/testdata/integration/expected_single_db.yaml index c0f598f71447..e4672993570e 100644 --- a/receiver/postgresqlreceiver/testdata/integration/expected_single_db.yaml +++ b/receiver/postgresqlreceiver/testdata/integration/expected_single_db.yaml @@ -175,6 +175,16 @@ resourceMetrics: startTimeUnixNano: "1687780251831660000" timeUnixNano: "1687780252833095000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1687780251831660000" + timeUnixNano: "1687780252833095000" + isMonotonic: true + unit: "{temp_file}" scope: name: otelcol/postgresqlreceiver version: latest diff --git a/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.yaml b/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.yaml index 937943ce4716..6d860fae5ab7 100644 --- a/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.yaml +++ b/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.yaml @@ -1,6 +1,5 @@ resourceMetrics: - - resource: - attributes: [] + - resource: {} scopeMetrics: - metrics: - description: Number of buffers allocated. @@ -9,8 +8,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{buffers}' - description: Number of buffers written. @@ -23,29 +22,29 @@ resourceMetrics: - key: source value: stringValue: backend - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: source value: stringValue: backend_fsync - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: source value: stringValue: bgwriter - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: source value: stringValue: checkpoints - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{buffers}' - description: The number of checkpoints performed. @@ -58,15 +57,15 @@ resourceMetrics: - key: type value: stringValue: requested - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: type value: stringValue: scheduled - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: Total time spent writing and syncing files to disk by checkpoints. @@ -79,15 +78,15 @@ resourceMetrics: - key: type value: stringValue: sync - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asDouble: 3.12 attributes: - key: type value: stringValue: write - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of times the background writer stopped a cleaning scan because it had written too many buffers. @@ -96,16 +95,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Configured maximum number of client connections allowed gauge: dataPoints: - asInt: "100" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.connection.max unit: '{connections}' - description: Number of user databases. @@ -114,8 +113,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{databases}' - description: The amount of data delayed in replication. gauge: @@ -125,16 +124,16 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.replication.data_delay unit: By - description: Age of the oldest WAL file. gauge: dataPoints: - asInt: "3600" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.wal.age unit: s - description: Time between flushing recent WAL locally and receiving notification that the standby server has completed an operation with it. @@ -148,8 +147,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "700" attributes: - key: operation @@ -158,8 +157,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "800" attributes: - key: operation @@ -168,8 +167,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.wal.lag unit: s scope: @@ -188,8 +187,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of commits. name: postgresql.commits @@ -197,8 +196,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The database disk usage. @@ -207,8 +206,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of deadlocks. name: postgresql.deadlocks @@ -216,18 +215,18 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true - unit: "{deadlock}" + unit: '{deadlock}' - description: The number of rollbacks. name: postgresql.rollbacks sum: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of user tables in a database. @@ -236,9 +235,19 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "5" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{temp_file}' scope: name: otelcol/postgresqlreceiver version: latest @@ -255,8 +264,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of commits. name: postgresql.commits @@ -264,8 +273,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The database disk usage. @@ -274,8 +283,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of deadlocks. name: postgresql.deadlocks @@ -283,18 +292,18 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true - unit: "{deadlock}" + unit: '{deadlock}' - description: The number of rollbacks. name: postgresql.rollbacks sum: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of user tables in a database. @@ -303,9 +312,19 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "4" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{temp_file}' scope: name: otelcol/postgresqlreceiver version: latest @@ -322,8 +341,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of commits. name: postgresql.commits @@ -331,8 +350,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The database disk usage. @@ -341,8 +360,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of deadlocks. name: postgresql.deadlocks @@ -350,18 +369,18 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true - unit: "{deadlock}" + unit: '{deadlock}' - description: The number of rollbacks. name: postgresql.rollbacks sum: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of user tables in a database. @@ -370,9 +389,19 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "6" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{temp_file}' scope: name: otelcol/postgresqlreceiver version: latest @@ -396,57 +425,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "20" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "22" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "27" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "24" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -459,29 +488,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "41" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -494,15 +523,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -510,8 +539,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "44" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -519,8 +548,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "45" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -546,57 +575,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "31" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "35" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "34" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -609,29 +638,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "47" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "44" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "45" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -644,15 +673,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -660,8 +689,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "48" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -669,8 +698,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "49" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -696,57 +725,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "22" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "24" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -759,29 +788,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "42" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "39" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -794,15 +823,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -810,8 +839,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "43" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -819,8 +848,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "44" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -846,57 +875,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "27" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "29" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "34" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "31" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -909,29 +938,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "46" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "44" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -944,15 +973,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -960,8 +989,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "47" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -969,8 +998,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "48" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -996,57 +1025,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "24" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "28" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "27" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -1059,29 +1088,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "44" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "41" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "42" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -1094,15 +1123,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -1110,8 +1139,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "45" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -1119,8 +1148,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "46" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -1146,57 +1175,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "29" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "31" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "36" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "35" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "34" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -1209,29 +1238,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "48" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "45" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "46" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -1244,15 +1273,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -1260,8 +1289,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "49" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -1269,8 +1298,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "50" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -1295,16 +1324,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "36" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "37" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -1329,16 +1358,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "38" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "39" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -1363,16 +1392,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "35" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "36" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -1397,16 +1426,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "37" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "38" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -1431,16 +1460,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "37" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "38" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -1465,16 +1494,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "39" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "40" - startTimeUnixNano: "1687780218605916000" - timeUnixNano: "1687780218606035000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: diff --git a/receiver/postgresqlreceiver/testdata/scraper/otel/expected.yaml b/receiver/postgresqlreceiver/testdata/scraper/otel/expected.yaml index 6a76b6d940b2..67f6b341cc70 100644 --- a/receiver/postgresqlreceiver/testdata/scraper/otel/expected.yaml +++ b/receiver/postgresqlreceiver/testdata/scraper/otel/expected.yaml @@ -1,6 +1,5 @@ resourceMetrics: - - resource: - attributes: [] + - resource: {} scopeMetrics: - metrics: - description: Number of buffers allocated. @@ -9,8 +8,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "10" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{buffers}' - description: Number of buffers written. @@ -23,29 +22,29 @@ resourceMetrics: - key: source value: stringValue: backend - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: source value: stringValue: backend_fsync - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: source value: stringValue: bgwriter - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: source value: stringValue: checkpoints - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{buffers}' - description: The number of checkpoints performed. @@ -58,15 +57,15 @@ resourceMetrics: - key: type value: stringValue: requested - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "2" attributes: - key: type value: stringValue: scheduled - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{checkpoints}' - description: Total time spent writing and syncing files to disk by checkpoints. @@ -79,15 +78,15 @@ resourceMetrics: - key: type value: stringValue: sync - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asDouble: 3.12 attributes: - key: type value: stringValue: write - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: ms - description: Number of times the background writer stopped a cleaning scan because it had written too many buffers. @@ -96,16 +95,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "11" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Configured maximum number of client connections allowed gauge: dataPoints: - asInt: "100" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.connection.max unit: '{connections}' - description: Number of user databases. @@ -114,8 +113,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{databases}' - description: The amount of data delayed in replication. gauge: @@ -125,16 +124,16 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.replication.data_delay unit: By - description: Age of the oldest WAL file. gauge: dataPoints: - asInt: "3600" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.wal.age unit: s - description: Time between flushing recent WAL locally and receiving notification that the standby server has completed an operation with it. @@ -148,8 +147,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "700" attributes: - key: operation @@ -158,8 +157,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "800" attributes: - key: operation @@ -168,8 +167,8 @@ resourceMetrics: - key: replication_client value: stringValue: unix - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.wal.lag unit: s scope: @@ -188,8 +187,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: The number of commits. name: postgresql.commits @@ -197,8 +196,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The database disk usage. @@ -207,8 +206,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of deadlocks. name: postgresql.deadlocks @@ -216,18 +215,18 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true - unit: "{deadlock}" + unit: '{deadlock}' - description: The number of rollbacks. name: postgresql.rollbacks sum: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: Number of user tables in a database. @@ -236,9 +235,19 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{table}' + - description: The number of temp files. + name: postgresql.temp_files + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "4" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{temp_file}' scope: name: otelcol/postgresqlreceiver version: latest @@ -262,57 +271,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "19" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "22" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "21" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "26" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "25" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "24" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "23" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -325,29 +334,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "42" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "39" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "40" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -360,15 +369,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "7" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -376,8 +385,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "43" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -385,8 +394,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "44" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -412,57 +421,57 @@ resourceMetrics: - key: source value: stringValue: heap_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "27" attributes: - key: source value: stringValue: heap_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "30" attributes: - key: source value: stringValue: idx_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "29" attributes: - key: source value: stringValue: idx_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "34" attributes: - key: source value: stringValue: tidx_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "33" attributes: - key: source value: stringValue: tidx_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "32" attributes: - key: source value: stringValue: toast_hit - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "31" attributes: - key: source value: stringValue: toast_read - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of db row operations. @@ -475,29 +484,29 @@ resourceMetrics: - key: operation value: stringValue: del - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "46" attributes: - key: operation value: stringValue: hot_upd - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "43" attributes: - key: operation value: stringValue: ins - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "44" attributes: - key: operation value: stringValue: upd - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: "1" - description: The number of rows in the database. @@ -510,15 +519,15 @@ resourceMetrics: - key: state value: stringValue: dead - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "9" attributes: - key: state value: stringValue: live - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: Disk space used by a table. name: postgresql.table.size @@ -526,8 +535,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "47" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Number of times a table has manually been vacuumed. name: postgresql.table.vacuum.count @@ -535,8 +544,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "48" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{vacuums}' scope: @@ -561,16 +570,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "35" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "36" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: @@ -595,16 +604,16 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "37" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{scans}' - description: The size of the index on disk. gauge: dataPoints: - asInt: "38" - startTimeUnixNano: "1687780216457686000" - timeUnixNano: "1687780216457879000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: postgresql.index.size unit: By scope: diff --git a/receiver/postgresqlreceiver/testdata/scraper/otel/expected_default_metrics.yaml b/receiver/postgresqlreceiver/testdata/scraper/otel/expected_default_metrics.yaml new file mode 100644 index 000000000000..54dffa0f5732 --- /dev/null +++ b/receiver/postgresqlreceiver/testdata/scraper/otel/expected_default_metrics.yaml @@ -0,0 +1,601 @@ +resourceMetrics: + - resource: {} + scopeMetrics: + - metrics: + - description: Number of buffers allocated. + name: postgresql.bgwriter.buffers.allocated + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "10" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{buffers}' + - description: Number of buffers written. + name: postgresql.bgwriter.buffers.writes + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "7" + attributes: + - key: source + value: + stringValue: backend + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "8" + attributes: + - key: source + value: + stringValue: backend_fsync + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "5" + attributes: + - key: source + value: + stringValue: bgwriter + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "9" + attributes: + - key: source + value: + stringValue: checkpoints + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{buffers}' + - description: The number of checkpoints performed. + name: postgresql.bgwriter.checkpoint.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + attributes: + - key: type + value: + stringValue: requested + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "2" + attributes: + - key: type + value: + stringValue: scheduled + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{checkpoints}' + - description: Total time spent writing and syncing files to disk by checkpoints. + name: postgresql.bgwriter.duration + sum: + aggregationTemporality: 2 + dataPoints: + - asDouble: 4.23 + attributes: + - key: type + value: + stringValue: sync + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asDouble: 3.12 + attributes: + - key: type + value: + stringValue: write + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: ms + - description: Number of times the background writer stopped a cleaning scan because it had written too many buffers. + name: postgresql.bgwriter.maxwritten + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "11" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: Configured maximum number of client connections allowed + gauge: + dataPoints: + - asInt: "100" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.connection.max + unit: '{connections}' + - description: Number of user databases. + name: postgresql.database.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{databases}' + - description: The amount of data delayed in replication. + gauge: + dataPoints: + - asInt: "1024" + attributes: + - key: replication_client + value: + stringValue: unix + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.replication.data_delay + unit: By + - description: Age of the oldest WAL file. + gauge: + dataPoints: + - asInt: "3600" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.wal.age + unit: s + - description: Time between flushing recent WAL locally and receiving notification that the standby server has completed an operation with it. + gauge: + dataPoints: + - asInt: "600" + attributes: + - key: operation + value: + stringValue: flush + - key: replication_client + value: + stringValue: unix + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "700" + attributes: + - key: operation + value: + stringValue: replay + - key: replication_client + value: + stringValue: unix + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "800" + attributes: + - key: operation + value: + stringValue: write + - key: replication_client + value: + stringValue: unix + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.wal.lag + unit: s + scope: + name: otelcol/postgresqlreceiver + version: latest + - resource: + attributes: + - key: postgresql.database.name + value: + stringValue: otel + scopeMetrics: + - metrics: + - description: The number of backends. + name: postgresql.backends + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "3" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: "1" + - description: The number of commits. + name: postgresql.commits + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: The database disk usage. + name: postgresql.db_size + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "4" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of rollbacks. + name: postgresql.rollbacks + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: Number of user tables in a database. + name: postgresql.table.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{table}' + scope: + name: otelcol/postgresqlreceiver + version: latest + - resource: + attributes: + - key: postgresql.database.name + value: + stringValue: otel + - key: postgresql.table.name + value: + stringValue: public.table1 + scopeMetrics: + - metrics: + - description: The number of blocks read. + name: postgresql.blocks_read + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "20" + attributes: + - key: source + value: + stringValue: heap_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "19" + attributes: + - key: source + value: + stringValue: heap_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "22" + attributes: + - key: source + value: + stringValue: idx_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "21" + attributes: + - key: source + value: + stringValue: idx_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "26" + attributes: + - key: source + value: + stringValue: tidx_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "25" + attributes: + - key: source + value: + stringValue: tidx_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "24" + attributes: + - key: source + value: + stringValue: toast_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "23" + attributes: + - key: source + value: + stringValue: toast_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: The number of db row operations. + name: postgresql.operations + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "41" + attributes: + - key: operation + value: + stringValue: del + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "42" + attributes: + - key: operation + value: + stringValue: hot_upd + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "39" + attributes: + - key: operation + value: + stringValue: ins + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "40" + attributes: + - key: operation + value: + stringValue: upd + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: The number of rows in the database. + name: postgresql.rows + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "8" + attributes: + - key: state + value: + stringValue: dead + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "7" + attributes: + - key: state + value: + stringValue: live + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: "1" + - description: Disk space used by a table. + name: postgresql.table.size + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "43" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: Number of times a table has manually been vacuumed. + name: postgresql.table.vacuum.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "44" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{vacuums}' + scope: + name: otelcol/postgresqlreceiver + version: latest + - resource: + attributes: + - key: postgresql.database.name + value: + stringValue: otel + - key: postgresql.table.name + value: + stringValue: public.table2 + scopeMetrics: + - metrics: + - description: The number of blocks read. + name: postgresql.blocks_read + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "28" + attributes: + - key: source + value: + stringValue: heap_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "27" + attributes: + - key: source + value: + stringValue: heap_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "30" + attributes: + - key: source + value: + stringValue: idx_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "29" + attributes: + - key: source + value: + stringValue: idx_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "34" + attributes: + - key: source + value: + stringValue: tidx_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "33" + attributes: + - key: source + value: + stringValue: tidx_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "32" + attributes: + - key: source + value: + stringValue: toast_hit + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "31" + attributes: + - key: source + value: + stringValue: toast_read + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: The number of db row operations. + name: postgresql.operations + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "45" + attributes: + - key: operation + value: + stringValue: del + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "46" + attributes: + - key: operation + value: + stringValue: hot_upd + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "43" + attributes: + - key: operation + value: + stringValue: ins + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "44" + attributes: + - key: operation + value: + stringValue: upd + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: "1" + - description: The number of rows in the database. + name: postgresql.rows + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "10" + attributes: + - key: state + value: + stringValue: dead + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "9" + attributes: + - key: state + value: + stringValue: live + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: "1" + - description: Disk space used by a table. + name: postgresql.table.size + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "47" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: Number of times a table has manually been vacuumed. + name: postgresql.table.vacuum.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "48" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{vacuums}' + scope: + name: otelcol/postgresqlreceiver + version: latest + - resource: + attributes: + - key: postgresql.database.name + value: + stringValue: otel + - key: postgresql.index.name + value: + stringValue: otel_test1_pkey + - key: postgresql.table.name + value: + stringValue: public.table1 + scopeMetrics: + - metrics: + - description: The number of index scans on a table. + name: postgresql.index.scans + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "35" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{scans}' + - description: The size of the index on disk. + gauge: + dataPoints: + - asInt: "36" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.index.size + unit: By + scope: + name: otelcol/postgresqlreceiver + version: latest + - resource: + attributes: + - key: postgresql.database.name + value: + stringValue: otel + - key: postgresql.index.name + value: + stringValue: otel_test2_pkey + - key: postgresql.table.name + value: + stringValue: public.table2 + scopeMetrics: + - metrics: + - description: The number of index scans on a table. + name: postgresql.index.scans + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "37" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + isMonotonic: true + unit: '{scans}' + - description: The size of the index on disk. + gauge: + dataPoints: + - asInt: "38" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: postgresql.index.size + unit: By + scope: + name: otelcol/postgresqlreceiver + version: latest diff --git a/receiver/prometheusreceiver/README.md b/receiver/prometheusreceiver/README.md index bc183ef996cc..1634d48f4981 100644 --- a/receiver/prometheusreceiver/README.md +++ b/receiver/prometheusreceiver/README.md @@ -149,3 +149,13 @@ This receiver accepts exemplars coming in Prometheus format and converts it to O [sc]: https://github.com/prometheus/prometheus/blob/v2.28.1/docs/configuration/configuration.md#scrape_config +## Resource and Scope + +This receiver drops the `target_info` prometheus metric, if present, and uses attributes on +that metric to populate the OpenTelemetry Resource. + +It drops `otel_scope_name` and `otel_scope_version` labels, if present, from metrics, and uses them to populate +the OpenTelemetry Instrumentation Scope name and version. It drops the `otel_scope_info` metric, +and uses attributes (other than `otel_scope_name` and `otel_scope_version`) to populate Scope +Attributes. + diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index c4dd03c88cd2..e46a657d1f3e 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -46,7 +46,7 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // 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 @@ -80,8 +80,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -195,8 +195,8 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index fae8bb9cf759..4603ef5b9505 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -82,8 +82,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.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -293,11 +293,11 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -1009,8 +1009,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= @@ -1027,8 +1027,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/receiver/prometheusreceiver/internal/metricfamily.go b/receiver/prometheusreceiver/internal/metricfamily.go index 85c764cb4413..18fa97f7618e 100644 --- a/receiver/prometheusreceiver/internal/metricfamily.go +++ b/receiver/prometheusreceiver/internal/metricfamily.go @@ -320,7 +320,7 @@ func (mf *metricFamily) appendMetric(metrics pmetric.MetricSlice, trimSuffixes b } metric.SetName(name) metric.SetDescription(mf.metadata.Help) - metric.SetUnit(mf.metadata.Unit) + metric.SetUnit(prometheus.UnitWordToUCUM(mf.metadata.Unit)) pointCount := 0 diff --git a/receiver/prometheusreceiver/internal/transaction.go b/receiver/prometheusreceiver/internal/transaction.go index 77fb8f5ffdfc..e1ac2012f213 100644 --- a/receiver/prometheusreceiver/internal/transaction.go +++ b/receiver/prometheusreceiver/internal/transaction.go @@ -27,27 +27,38 @@ import ( ) const ( - targetMetricName = "target_info" - receiverName = "otelcol/prometheusreceiver" + targetMetricName = "target_info" + scopeMetricName = "otel_scope_info" + scopeNameLabel = "otel_scope_name" + scopeVersionLabel = "otel_scope_version" + receiverName = "otelcol/prometheusreceiver" ) type transaction struct { - isNew bool - trimSuffixes bool - ctx context.Context - families map[string]*metricFamily - mc scrape.MetricMetadataStore - sink consumer.Metrics - externalLabels labels.Labels - nodeResource pcommon.Resource - logger *zap.Logger - buildInfo component.BuildInfo - metricAdjuster MetricsAdjuster - obsrecv *obsreport.Receiver + isNew bool + trimSuffixes bool + ctx context.Context + families map[scopeID]map[string]*metricFamily + mc scrape.MetricMetadataStore + sink consumer.Metrics + externalLabels labels.Labels + nodeResource pcommon.Resource + scopeAttributes map[scopeID]pcommon.Map + logger *zap.Logger + buildInfo component.BuildInfo + metricAdjuster MetricsAdjuster + obsrecv *obsreport.Receiver // Used as buffer to calculate series ref hash. bufBytes []byte } +var emptyScopeID scopeID + +type scopeID struct { + name string + version string +} + func newTransaction( ctx context.Context, metricAdjuster MetricsAdjuster, @@ -57,17 +68,18 @@ func newTransaction( obsrecv *obsreport.Receiver, trimSuffixes bool) *transaction { return &transaction{ - ctx: ctx, - families: make(map[string]*metricFamily), - isNew: true, - trimSuffixes: trimSuffixes, - sink: sink, - metricAdjuster: metricAdjuster, - externalLabels: externalLabels, - logger: settings.Logger, - buildInfo: settings.BuildInfo, - obsrecv: obsrecv, - bufBytes: make([]byte, 0, 1024), + ctx: ctx, + families: make(map[scopeID]map[string]*metricFamily), + isNew: true, + trimSuffixes: trimSuffixes, + sink: sink, + metricAdjuster: metricAdjuster, + externalLabels: externalLabels, + logger: settings.Logger, + buildInfo: settings.BuildInfo, + obsrecv: obsrecv, + bufBytes: make([]byte, 0, 1024), + scopeAttributes: make(map[scopeID]pcommon.Map), } } @@ -121,10 +133,17 @@ func (t *transaction) Append(_ storage.SeriesRef, ls labels.Labels, atMs int64, // For the `target_info` metric we need to convert it to resource attributes. if metricName == targetMetricName { - return 0, t.AddTargetInfo(ls) + t.AddTargetInfo(ls) + return 0, nil + } + + // For the `otel_scope_info` metric we need to convert it to scope attributes. + if metricName == scopeMetricName { + t.addScopeInfo(ls) + return 0, nil } - curMF := t.getOrCreateMetricFamily(metricName) + curMF := t.getOrCreateMetricFamily(getScopeID(ls), metricName) err := curMF.addSeries(t.getSeriesRef(ls, curMF.mtype), metricName, ls, atMs, val) if err != nil { t.logger.Warn("failed to add datapoint", zap.Error(err), zap.String("metric_name", metricName), zap.Any("labels", ls)) @@ -133,18 +152,22 @@ func (t *transaction) Append(_ storage.SeriesRef, ls labels.Labels, atMs int64, return 0, nil // never return errors, as that fails the whole scrape } -func (t *transaction) getOrCreateMetricFamily(mn string) *metricFamily { - curMf, ok := t.families[mn] +func (t *transaction) getOrCreateMetricFamily(scope scopeID, mn string) *metricFamily { + _, ok := t.families[scope] + if !ok { + t.families[scope] = make(map[string]*metricFamily) + } + curMf, ok := t.families[scope][mn] if !ok { fn := mn if _, ok := t.mc.GetMetadata(mn); !ok { fn = normalizeMetricName(mn) } - if mf, ok := t.families[fn]; ok && mf.includesMetric(mn) { + if mf, ok := t.families[scope][fn]; ok && mf.includesMetric(mn) { curMf = mf } else { curMf = newMetricFamily(mn, t.mc, t.logger) - t.families[curMf.name] = curMf + t.families[scope][curMf.name] = curMf } } return curMf @@ -174,7 +197,7 @@ func (t *transaction) AppendExemplar(_ storage.SeriesRef, l labels.Labels, e exe return 0, errMetricNameNotFound } - mf := t.getOrCreateMetricFamily(mn) + mf := t.getOrCreateMetricFamily(getScopeID(l), mn) mf.addExemplar(t.getSeriesRef(l, mf.mtype), e) return 0, nil @@ -201,18 +224,47 @@ func (t *transaction) getMetrics(resource pcommon.Resource) (pmetric.Metrics, er md := pmetric.NewMetrics() rms := md.ResourceMetrics().AppendEmpty() resource.CopyTo(rms.Resource()) - ils := rms.ScopeMetrics().AppendEmpty() - ils.Scope().SetName(receiverName) - ils.Scope().SetVersion(t.buildInfo.Version) - metrics := ils.Metrics() - for _, mf := range t.families { - mf.appendMetric(metrics, t.trimSuffixes) + for scope, mfs := range t.families { + ils := rms.ScopeMetrics().AppendEmpty() + // If metrics don't include otel_scope_name or otel_scope_version + // labels, use the receiver name and version. + if scope == emptyScopeID { + ils.Scope().SetName(receiverName) + ils.Scope().SetVersion(t.buildInfo.Version) + } else { + // Otherwise, use the scope that was provided with the metrics. + ils.Scope().SetName(scope.name) + ils.Scope().SetVersion(scope.version) + // If we got an otel_scope_info metric for that scope, get scope + // attributes from it. + attributes, ok := t.scopeAttributes[scope] + if ok { + attributes.CopyTo(ils.Scope().Attributes()) + } + } + metrics := ils.Metrics() + for _, mf := range mfs { + mf.appendMetric(metrics, t.trimSuffixes) + } } return md, nil } +func getScopeID(ls labels.Labels) scopeID { + var scope scopeID + for _, lbl := range ls { + if lbl.Name == scopeNameLabel { + scope.name = lbl.Value + } + if lbl.Name == scopeVersionLabel { + scope.version = lbl.Value + } + } + return scope +} + func (t *transaction) initTransaction(labels labels.Labels) error { target, ok := scrape.TargetFromContext(t.ctx) if !ok { @@ -268,18 +320,34 @@ func (t *transaction) UpdateMetadata(_ storage.SeriesRef, _ labels.Labels, _ met return 0, nil } -func (t *transaction) AddTargetInfo(labels labels.Labels) error { +func (t *transaction) AddTargetInfo(labels labels.Labels) { attrs := t.nodeResource.Attributes() - for _, lbl := range labels { if lbl.Name == model.JobLabel || lbl.Name == model.InstanceLabel || lbl.Name == model.MetricNameLabel { continue } - attrs.PutStr(lbl.Name, lbl.Value) } +} - return nil +func (t *transaction) addScopeInfo(labels labels.Labels) { + attrs := pcommon.NewMap() + scope := scopeID{} + for _, lbl := range labels { + if lbl.Name == model.JobLabel || lbl.Name == model.InstanceLabel || lbl.Name == model.MetricNameLabel { + continue + } + if lbl.Name == scopeNameLabel { + scope.name = lbl.Value + continue + } + if lbl.Name == scopeVersionLabel { + scope.version = lbl.Value + continue + } + attrs.PutStr(lbl.Name, lbl.Value) + } + t.scopeAttributes[scope] = attrs } func getSeriesRef(bytes []byte, ls labels.Labels, mtype pmetric.MetricType) (uint64, []byte) { diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 4cd6fa5a81e2..30646cedd4ac 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -378,7 +378,7 @@ func doCompareNormalized(t *testing.T, name string, want pcommon.Map, got pmetri }) } -func assertMetricPresent(name string, metricTypeExpectations metricTypeComparator, dataPointExpectations []dataPointExpectation) testExpectation { +func assertMetricPresent(name string, metricTypeExpectations metricTypeComparator, metricUnitExpectations metricTypeComparator, dataPointExpectations []dataPointExpectation) testExpectation { return func(t *testing.T, rm pmetric.ResourceMetrics) { allMetrics := getMetrics(rm) var present bool @@ -389,6 +389,7 @@ func assertMetricPresent(name string, metricTypeExpectations metricTypeComparato present = true metricTypeExpectations(t, m) + metricUnitExpectations(t, m) for i, de := range dataPointExpectations { switch m.Type() { case pmetric.MetricTypeGauge: @@ -434,6 +435,12 @@ func compareMetricType(typ pmetric.MetricType) metricTypeComparator { } } +func compareMetricUnit(unit string) metricTypeComparator { + return func(t *testing.T, metric pmetric.Metric) { + assert.Equal(t, unit, metric.Unit(), "Metric unit does not match") + } +} + func compareMetricIsMonotonic(isMonotonic bool) metricTypeComparator { return func(t *testing.T, metric pmetric.Metric) { assert.Equal(t, pmetric.MetricTypeSum.String(), metric.Type().String(), "IsMonotonic only exists for sums") diff --git a/receiver/prometheusreceiver/metrics_receiver_honor_timestamp_test.go b/receiver/prometheusreceiver/metrics_receiver_honor_timestamp_test.go index 951934d646dd..3ce6b001b28e 100644 --- a/receiver/prometheusreceiver/metrics_receiver_honor_timestamp_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_honor_timestamp_test.go @@ -208,6 +208,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -218,6 +219,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -238,6 +240,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -249,6 +252,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -268,6 +272,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme e2 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -278,6 +283,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -298,6 +304,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -309,6 +316,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -328,6 +336,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme e3 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -338,6 +347,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -358,6 +368,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -369,6 +380,7 @@ func verifyHonorTimeStampsTrue(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -396,6 +408,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -406,6 +419,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -426,6 +440,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -437,6 +452,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -458,6 +474,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm e2 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -468,6 +485,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -488,6 +506,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -499,6 +518,7 @@ func verifyHonorTimeStampsFalse(t *testing.T, td *testData, resourceMetrics []pm }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_receiver_labels_test.go b/receiver/prometheusreceiver/metrics_receiver_labels_test.go index 73ee1ae69628..c1e0631f0ff5 100644 --- a/receiver/prometheusreceiver/metrics_receiver_labels_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_labels_test.go @@ -44,6 +44,7 @@ func verifyExternalLabels(t *testing.T, td *testData, rms []pmetric.ResourceMetr doCompare(t, "scrape-externalLabels", wantAttributes, rms[0], []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -74,6 +75,7 @@ func verifyLabelLimitTarget1(t *testing.T, td *testData, rms []pmetric.ResourceM doCompare(t, "scrape-labelLimit", want, rms[0], []testExpectation{ assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -165,6 +167,7 @@ func verifyLabelConfigTarget1(t *testing.T, td *testData, rms []pmetric.Resource e1 := []testExpectation{ assertMetricPresent("test_counter0", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -177,6 +180,7 @@ func verifyLabelConfigTarget1(t *testing.T, td *testData, rms []pmetric.Resource }), assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -188,6 +192,7 @@ func verifyLabelConfigTarget1(t *testing.T, td *testData, rms []pmetric.Resource }), assertMetricPresent("test_histogram0", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -200,6 +205,7 @@ func verifyLabelConfigTarget1(t *testing.T, td *testData, rms []pmetric.Resource }), assertMetricPresent("test_summary0", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -324,6 +330,7 @@ func verifyEmptyLabelValuesTarget1(t *testing.T, td *testData, rms []pmetric.Res e1 := []testExpectation{ assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -335,6 +342,7 @@ func verifyEmptyLabelValuesTarget1(t *testing.T, td *testData, rms []pmetric.Res }), assertMetricPresent("test_counter0", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -346,6 +354,7 @@ func verifyEmptyLabelValuesTarget1(t *testing.T, td *testData, rms []pmetric.Res }), assertMetricPresent("test_histogram0", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -358,6 +367,7 @@ func verifyEmptyLabelValuesTarget1(t *testing.T, td *testData, rms []pmetric.Res }), assertMetricPresent("test_summary0", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -395,6 +405,7 @@ func verifyEmptyLabelValuesTarget2(t *testing.T, td *testData, rms []pmetric.Res e1 := []testExpectation{ assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -413,6 +424,7 @@ func verifyEmptyLabelValuesTarget2(t *testing.T, td *testData, rms []pmetric.Res }), assertMetricPresent("test_counter0", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -469,6 +481,7 @@ func verifyHonorLabelsFalse(t *testing.T, td *testData, rms []pmetric.ResourceMe doCompare(t, "honor_labels_false", want, rms[0], []testExpectation{ assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -504,6 +517,7 @@ func verifyEmptyLabelsTarget1(t *testing.T, td *testData, rms []pmetric.Resource assertMetricPresent( "test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -517,6 +531,7 @@ func verifyEmptyLabelsTarget1(t *testing.T, td *testData, rms []pmetric.Resource assertMetricPresent( "test_counter0", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -574,6 +589,7 @@ func verifyHonorLabelsTrue(t *testing.T, td *testData, rms []pmetric.ResourceMet doCompare(t, "honor_labels_true", expectedAttributes, rms[0], []testExpectation{ assertMetricPresent("test_gauge0", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -660,6 +676,7 @@ func verifyRelabelJobInstance(t *testing.T, td *testData, rms []pmetric.Resource doCompare(t, "relabel-job-instance", wantAttributes, rms[0], []testExpectation{ assertMetricPresent("jvm_memory_bytes_used", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -708,6 +725,7 @@ func verifyTargetInfoResourceAttributes(t *testing.T, td *testData, rms []pmetri doCompare(t, "relabel-job-instance", wantAttributes, rms[0], []testExpectation{ assertMetricPresent("jvm_memory_bytes_used", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -719,3 +737,49 @@ func verifyTargetInfoResourceAttributes(t *testing.T, td *testData, rms []pmetri }), }) } + +const targetInstrumentationScopes = ` +# HELP jvm_memory_bytes_used Used bytes of a given JVM memory area. +# TYPE jvm_memory_bytes_used gauge +jvm_memory_bytes_used{area="heap", otel_scope_name="fake.scope.name", otel_scope_version="v0.1.0"} 100 +jvm_memory_bytes_used{area="heap", otel_scope_name="scope.with.attributes", otel_scope_version="v1.5.0"} 100 +jvm_memory_bytes_used{area="heap"} 100 +# TYPE otel_scope_info gauge +otel_scope_info{animal="bear", otel_scope_name="scope.with.attributes", otel_scope_version="v1.5.0"} 1 +` + +func TestScopeInfoScopeAttributes(t *testing.T) { + targets := []*testData{ + { + name: "target1", + pages: []mockPrometheusResponse{ + {code: 200, data: targetInstrumentationScopes}, + }, + validateFunc: verifyMultipleScopes, + }, + } + + testComponent(t, targets, false, false, "") +} + +func verifyMultipleScopes(t *testing.T, td *testData, rms []pmetric.ResourceMetrics) { + verifyNumValidScrapeResults(t, td, rms) + require.Greater(t, len(rms), 0, "At least one resource metric should be present") + + sms := rms[0].ScopeMetrics() + require.Equal(t, sms.Len(), 3, "Three scope metrics should be present") + sms.Sort(func(a, b pmetric.ScopeMetrics) bool { + return a.Scope().Name() < b.Scope().Name() + }) + require.Equal(t, sms.At(0).Scope().Name(), "fake.scope.name") + require.Equal(t, sms.At(0).Scope().Version(), "v0.1.0") + require.Equal(t, sms.At(0).Scope().Attributes().Len(), 0) + require.Equal(t, sms.At(1).Scope().Name(), "otelcol/prometheusreceiver") + require.Equal(t, sms.At(1).Scope().Attributes().Len(), 0) + require.Equal(t, sms.At(2).Scope().Name(), "scope.with.attributes") + require.Equal(t, sms.At(2).Scope().Version(), "v1.5.0") + require.Equal(t, sms.At(2).Scope().Attributes().Len(), 1) + scopeAttrVal, found := sms.At(2).Scope().Attributes().Get("animal") + require.True(t, found) + require.Equal(t, scopeAttrVal.Str(), "bear") +} diff --git a/receiver/prometheusreceiver/metrics_receiver_metric_name_normalize_test.go b/receiver/prometheusreceiver/metrics_receiver_metric_name_normalize_test.go index 9cb4274d7650..5ac7682f1b7a 100644 --- a/receiver/prometheusreceiver/metrics_receiver_metric_name_normalize_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_metric_name_normalize_test.go @@ -61,6 +61,7 @@ func verifyNormalizeMetric(t *testing.T, td *testData, resourceMetrics []pmetric e1 := []testExpectation{ assertMetricPresent("http_connected", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -79,6 +80,7 @@ func verifyNormalizeMetric(t *testing.T, td *testData, resourceMetrics []pmetric }), assertMetricPresent("foo_gauge_total", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -97,6 +99,7 @@ func verifyNormalizeMetric(t *testing.T, td *testData, resourceMetrics []pmetric }), assertMetricPresent("http_connection_duration", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit("s"), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -115,6 +118,7 @@ func verifyNormalizeMetric(t *testing.T, td *testData, resourceMetrics []pmetric }), assertMetricPresent("foo_gauge", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit("s"), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_receiver_non_numerical_test.go b/receiver/prometheusreceiver/metrics_receiver_non_numerical_test.go index 926760237f78..05107737acb9 100644 --- a/receiver/prometheusreceiver/metrics_receiver_non_numerical_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_non_numerical_test.go @@ -95,6 +95,7 @@ func verifyStaleNaNsSuccessfulScrape(t *testing.T, td *testData, resourceMetric e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -105,6 +106,7 @@ func verifyStaleNaNsSuccessfulScrape(t *testing.T, td *testData, resourceMetric }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -125,6 +127,7 @@ func verifyStaleNaNsSuccessfulScrape(t *testing.T, td *testData, resourceMetric }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -136,6 +139,7 @@ func verifyStaleNaNsSuccessfulScrape(t *testing.T, td *testData, resourceMetric }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -161,6 +165,7 @@ func verifyStaleNaNsFailedScrape(t *testing.T, td *testData, resourceMetric pmet e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -171,6 +176,7 @@ func verifyStaleNaNsFailedScrape(t *testing.T, td *testData, resourceMetric pmet }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -189,6 +195,7 @@ func verifyStaleNaNsFailedScrape(t *testing.T, td *testData, resourceMetric pmet }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -200,6 +207,7 @@ func verifyStaleNaNsFailedScrape(t *testing.T, td *testData, resourceMetric pmet }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -261,6 +269,7 @@ func verifyNormalNaNs(t *testing.T, td *testData, resourceMetrics []pmetric.Reso e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -271,6 +280,7 @@ func verifyNormalNaNs(t *testing.T, td *testData, resourceMetrics []pmetric.Reso }), assertMetricPresent("redis_connected_clients", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -282,6 +292,7 @@ func verifyNormalNaNs(t *testing.T, td *testData, resourceMetrics []pmetric.Reso }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -345,6 +356,7 @@ func verifyInfValues(t *testing.T, td *testData, resourceMetrics []pmetric.Resou e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -355,6 +367,7 @@ func verifyInfValues(t *testing.T, td *testData, resourceMetrics []pmetric.Resou }), assertMetricPresent("redis_connected_clients", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -366,6 +379,7 @@ func verifyInfValues(t *testing.T, td *testData, resourceMetrics []pmetric.Resou }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -378,6 +392,7 @@ func verifyInfValues(t *testing.T, td *testData, resourceMetrics []pmetric.Resou }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_receiver_open_metrics_test.go b/receiver/prometheusreceiver/metrics_receiver_open_metrics_test.go index 71c738fed4de..3ab80d737ed7 100644 --- a/receiver/prometheusreceiver/metrics_receiver_open_metrics_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_open_metrics_test.go @@ -246,6 +246,7 @@ func verifyInfoStatesetMetrics(t *testing.T, td *testData, resourceMetrics []pme e1 := []testExpectation{ assertMetricPresent("foo", compareMetricIsMonotonic(false), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -264,6 +265,7 @@ func verifyInfoStatesetMetrics(t *testing.T, td *testData, resourceMetrics []pme }), assertMetricPresent("bar", compareMetricIsMonotonic(false), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_receiver_report_extra_scrape_metrics_test.go b/receiver/prometheusreceiver/metrics_receiver_report_extra_scrape_metrics_test.go index 67b85b823936..84121f130184 100644 --- a/receiver/prometheusreceiver/metrics_receiver_report_extra_scrape_metrics_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_report_extra_scrape_metrics_test.go @@ -119,6 +119,7 @@ func verifyMetrics(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e1 := []testExpectation{ assertMetricPresent("http_connected_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -137,6 +138,7 @@ func verifyMetrics(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("foo_gauge_total", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_receiver_test.go b/receiver/prometheusreceiver/metrics_receiver_test.go index ff000eef3249..acfc6f8a4f83 100644 --- a/receiver/prometheusreceiver/metrics_receiver_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_test.go @@ -129,6 +129,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -139,6 +140,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -159,6 +161,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -170,6 +173,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -191,6 +195,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e2 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -201,6 +206,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -221,6 +227,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -233,6 +240,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -254,6 +262,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e3 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -264,6 +273,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -286,6 +296,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -298,6 +309,7 @@ func verifyTarget1(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -515,6 +527,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -525,6 +538,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -545,6 +559,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -565,6 +580,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -595,6 +611,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e2 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -605,6 +622,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -633,6 +651,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -661,6 +680,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -699,6 +719,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e3 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -709,6 +730,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -737,6 +759,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -765,6 +788,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -803,6 +827,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e4 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -813,6 +838,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -841,6 +867,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -869,6 +896,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -907,6 +935,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e5 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -917,6 +946,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -945,6 +975,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -973,6 +1004,7 @@ func verifyTarget2(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -1097,6 +1129,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e1 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -1107,6 +1140,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -1118,6 +1152,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("corrupted_hist", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -1129,6 +1164,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -1159,6 +1195,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e2 := []testExpectation{ assertMetricPresent("go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -1169,6 +1206,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("http_request_duration_seconds", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -1180,6 +1218,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("corrupted_hist", compareMetricType(pmetric.MetricTypeHistogram), + compareMetricUnit(""), []dataPointExpectation{ { histogramPointComparator: []histogramPointComparator{ @@ -1191,6 +1230,7 @@ func verifyTarget3(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("rpc_duration_seconds", compareMetricType(pmetric.MetricTypeSummary), + compareMetricUnit(""), []dataPointExpectation{ { summaryPointComparator: []summaryPointComparator{ @@ -1227,6 +1267,7 @@ func verifyTarget4(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc e1 := []testExpectation{ assertMetricPresent("foo", compareMetricIsMonotonic(true), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -1237,6 +1278,7 @@ func verifyTarget4(t *testing.T, td *testData, resourceMetrics []pmetric.Resourc }), assertMetricPresent("foo_total", compareMetricIsMonotonic(true), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -1476,6 +1518,7 @@ func verifyUntypedMetrics(t *testing.T, td *testData, resourceMetrics []pmetric. e1 := []testExpectation{ assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -1494,6 +1537,7 @@ func verifyUntypedMetrics(t *testing.T, td *testData, resourceMetrics []pmetric. }), assertMetricPresent("redis_connected_clients", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ diff --git a/receiver/prometheusreceiver/metrics_reciever_metric_rename_test.go b/receiver/prometheusreceiver/metrics_reciever_metric_rename_test.go index 70c945cba4ab..70abdd2eba09 100644 --- a/receiver/prometheusreceiver/metrics_reciever_metric_rename_test.go +++ b/receiver/prometheusreceiver/metrics_reciever_metric_rename_test.go @@ -120,6 +120,7 @@ func verifyRenameMetric(t *testing.T, td *testData, resourceMetrics []pmetric.Re e1 := []testExpectation{ assertMetricPresent("foo", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -139,6 +140,7 @@ func verifyRenameMetric(t *testing.T, td *testData, resourceMetrics []pmetric.Re // renaming config converts any metric type to untyped metric, which then gets converted to gauge double type by metric builder assertMetricPresent("http_requests_total", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -174,6 +176,7 @@ func verifyRenameMetricKeepAction(t *testing.T, td *testData, resourceMetrics [] e1 := []testExpectation{ assertMetricPresent("rpc_duration_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -281,6 +284,7 @@ func verifyRenameLabel(t *testing.T, td *testData, resourceMetrics []pmetric.Res e1 := []testExpectation{ assertMetricPresent("http_go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -292,6 +296,7 @@ func verifyRenameLabel(t *testing.T, td *testData, resourceMetrics []pmetric.Res }), assertMetricPresent("http_connected_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -303,6 +308,7 @@ func verifyRenameLabel(t *testing.T, td *testData, resourceMetrics []pmetric.Res }), assertMetricPresent("redis_http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -323,6 +329,7 @@ func verifyRenameLabel(t *testing.T, td *testData, resourceMetrics []pmetric.Res }), assertMetricPresent("rpc_duration_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -384,6 +391,7 @@ func verifyRenameLabelKeepAction(t *testing.T, td *testData, resourceMetrics []p e1 := []testExpectation{ assertMetricPresent("http_go_threads", compareMetricType(pmetric.MetricTypeGauge), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -395,6 +403,7 @@ func verifyRenameLabelKeepAction(t *testing.T, td *testData, resourceMetrics []p }), assertMetricPresent("http_connected_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -406,6 +415,7 @@ func verifyRenameLabelKeepAction(t *testing.T, td *testData, resourceMetrics []p }), assertMetricPresent("redis_http_requests_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ @@ -424,6 +434,7 @@ func verifyRenameLabelKeepAction(t *testing.T, td *testData, resourceMetrics []p }), assertMetricPresent("rpc_duration_total", compareMetricType(pmetric.MetricTypeSum), + compareMetricUnit(""), []dataPointExpectation{ { numberPointComparator: []numberPointComparator{ diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index a8dc40f122ae..a1f29074df75 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -217,7 +217,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index e339c3cfd3a4..4d8e891352ca 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -33,7 +33,7 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect @@ -68,8 +68,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -158,7 +158,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/api v0.136.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 7d260123ca7c..12f584955338 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -80,8 +80,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.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -282,11 +282,11 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -939,7 +939,7 @@ 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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= 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= @@ -956,8 +956,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index a822ebd231a9..4848f8fc2ea8 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -33,7 +33,7 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect @@ -68,8 +68,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -158,7 +158,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/api v0.136.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 7d260123ca7c..12f584955338 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -80,8 +80,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.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -282,11 +282,11 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -939,7 +939,7 @@ 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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= 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= @@ -956,8 +956,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/receiver/rabbitmqreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/rabbitmqreceiver/testdata/expected_metrics/metrics_golden.yaml index 71437ee3d5ee..02c7b348173d 100644 --- a/receiver/rabbitmqreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/rabbitmqreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -18,8 +18,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{consumers}' - description: The total number of messages currently in the queue. name: rabbitmq.message.current @@ -31,15 +31,15 @@ resourceMetrics: - key: state value: stringValue: ready - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: state value: stringValue: unacknowledged - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{messages}' scope: name: otelcol/rabbitmqreceiver @@ -63,8 +63,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{consumers}' - description: The number of messages acknowledged by consumers. name: rabbitmq.message.acknowledged @@ -72,8 +72,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7827" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{messages}' - description: The total number of messages currently in the queue. @@ -86,15 +86,15 @@ resourceMetrics: - key: state value: stringValue: ready - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state value: stringValue: unacknowledged - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{messages}' - description: The number of messages delivered to consumers. name: rabbitmq.message.delivered @@ -102,8 +102,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7828" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{messages}' - description: The number of messages dropped as unroutable. @@ -112,8 +112,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{messages}' - description: The number of messages published to a queue. @@ -122,8 +122,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "7830" - startTimeUnixNano: "1656512143898318000" - timeUnixNano: "1656512143899572000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{messages}' scope: diff --git a/receiver/receivercreator/README.md b/receiver/receivercreator/README.md index 2185a3cd9080..2ffa14f7723e 100644 --- a/receiver/receivercreator/README.md +++ b/receiver/receivercreator/README.md @@ -47,6 +47,8 @@ syntax](https://github.com/antonmedv/expr/blob/master/docs/Language-Definition.m Variables available are detailed below in [Rule Expressions](#rule-expressions). +Note: The built-in `type` function introduced in v1.14.1 has been relocated to `typeOf`. + **receivers.<receiver_type/id>.config** This is configuration that will be used when creating the receiver at diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 637a92881d16..d490b3477fa6 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receiv go 1.20 require ( - github.com/antonmedv/expr v1.13.0 + github.com/antonmedv/expr v1.14.3 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 @@ -35,7 +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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -87,7 +87,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index e38283f03fac..96d581deda3b 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -43,8 +43,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antonmedv/expr v1.13.0 h1:8YrTtlCzlOtXw+hpeCLDLL2uo0C0k6jmYpYTGws5c5w= -github.com/antonmedv/expr v1.13.0/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= +github.com/antonmedv/expr v1.14.3 h1:GPrP7xKPWkFaLANPS7tPrgkNs7FMHpZdL72Dc5kFykg= +github.com/antonmedv/expr v1.14.3/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -196,8 +196,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -717,8 +717,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/receivercreator/rules.go b/receiver/receivercreator/rules.go index 378955296c71..6e9221c22193 100644 --- a/receiver/receivercreator/rules.go +++ b/receiver/receivercreator/rules.go @@ -9,6 +9,7 @@ import ( "regexp" "github.com/antonmedv/expr" + "github.com/antonmedv/expr/builtin" "github.com/antonmedv/expr/vm" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -36,7 +37,15 @@ func newRule(ruleStr string) (rule, error) { // TODO: Maybe use https://godoc.org/github.com/antonmedv/expr#Env in type checking // depending on type == specified. - v, err := expr.Compile(ruleStr) + v, err := expr.Compile( + ruleStr, + // expr v1.14.1 introduced a `type` builtin whose implementation we relocate to `typeOf` + // to avoid collision + expr.DisableBuiltin("type"), + expr.Function("typeOf", func(params ...interface{}) (interface{}, error) { + return builtin.Type(params[0]), nil + }, new(func(interface{}) string)), + ) if err != nil { return rule{}, err } diff --git a/receiver/receivercreator/rules_test.go b/receiver/receivercreator/rules_test.go index ca047132dbbd..b2e0f65ffb0e 100644 --- a/receiver/receivercreator/rules_test.go +++ b/receiver/receivercreator/rules_test.go @@ -31,6 +31,7 @@ func Test_ruleEval(t *testing.T) { {"annotations", args{`type == "pod" && annotations["scrape"] == "true"`, podEndpoint}, true, false}, {"basic container", args{`type == "container" && labels["region"] == "east-1"`, containerEndpoint}, true, false}, {"basic k8s.node", args{`type == "k8s.node" && kubelet_endpoint_port == 10250`, k8sNodeEndpoint}, true, false}, + {"relocated type builtin", args{`type == "k8s.node" && typeOf("some string") == "string"`, k8sNodeEndpoint}, true, false}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/receiver/redisreceiver/config.go b/receiver/redisreceiver/config.go index 65ff7b30afcb..d8580c690fd2 100644 --- a/receiver/redisreceiver/config.go +++ b/receiver/redisreceiver/config.go @@ -20,8 +20,14 @@ type Config struct { // TODO allow users to add additional resource key value pairs? + // Optional username. Use the specified Username to authenticate the current connection + // with one of the connections defined in the ACL list when connecting + // to a Redis 6.0 instance, or greater, that is using the Redis ACL system. + Username string `mapstructure:"username"` + // Optional password. Must match the password specified in the - // requirepass server configuration option. + // requirepass server configuration option, or the user's password when connecting + // 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"` diff --git a/receiver/redisreceiver/config.md b/receiver/redisreceiver/config.md index ceea59bbf224..48ca8477a84b 100644 --- a/receiver/redisreceiver/config.md +++ b/receiver/redisreceiver/config.md @@ -12,7 +12,8 @@ and extend it with more fields if needed. | collection_interval |[time-Duration](#time-Duration)| 10s | | | endpoint |string| | Endpoint configures the address for this network connection. For TCP and UDP networks, the address has the form "host:port". The host must be a literal IP address, or a host name that can be resolved to IP addresses. The port must be a literal port number or a service name. If the host is a literal IPv6 address it must be enclosed in square brackets, as in "[2001:db8::1]:80" or "[fe80::1%zone]:80". The zone specifies the scope of the literal IPv6 address as defined in RFC 4007. | | transport |string| tcp | Transport to use. Known protocols are "tcp", "tcp4" (IPv4-only), "tcp6" (IPv6-only), "udp", "udp4" (IPv4-only), "udp6" (IPv6-only), "ip", "ip4" (IPv4-only), "ip6" (IPv6-only), "unix", "unixgram" and "unixpacket". | -| password |string| | Optional password. Must match the password specified in the requirepass server configuration option. | +| username |string| | Optional username. Use the specified username to authenticate the current connection with one of the connections defined in the ACL list when connecting to a Redis 6.0 instance, or greater, that is using the Redis ACL system. | +| password |string| | Optional password. Must match the password specified in the requirepass server configuration option or the user's password when connecting to a Redis 6.0 instance, or greater, that is using the Redis ACL system. | | tls |[tls-TLSClientSetting](#tls-TLSClientSetting)| | TLSClientSetting contains TLS configurations that are specific to client connections in addition to the common configurations. This should be used by components configuring TLS client connections. | | metrics |[metrics-MetricsSettings](#metrics-MetricsSettings)| | MetricsSettings provides settings for redisreceiver metrics. | diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index f672f4c8edf5..9e0789d22249 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -38,6 +38,7 @@ func TestConfig(t *testing.T) { TLS: configtls.TLSClientSetting{ Insecure: true, }, + Username: "test", Password: "test", ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index dc845ceafdfe..f881ffa07d15 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -36,7 +36,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index b966cbe7a06d..7342d2bab673 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -142,8 +142,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/redisreceiver/redis_scraper.go b/receiver/redisreceiver/redis_scraper.go index 107132d71d08..efe0a0c8e433 100644 --- a/receiver/redisreceiver/redis_scraper.go +++ b/receiver/redisreceiver/redis_scraper.go @@ -35,6 +35,7 @@ const redisMaxDbs = 16 // Maximum possible number of redis databases func newRedisScraper(cfg *Config, settings receiver.CreateSettings) (scraperhelper.Scraper, error) { opts := &redis.Options{ Addr: cfg.Endpoint, + Username: cfg.Username, Password: string(cfg.Password), Network: cfg.Transport, } diff --git a/receiver/redisreceiver/testdata/config.yaml b/receiver/redisreceiver/testdata/config.yaml index 018061947a15..6f7ffe158b3b 100644 --- a/receiver/redisreceiver/testdata/config.yaml +++ b/receiver/redisreceiver/testdata/config.yaml @@ -1,5 +1,6 @@ redis: endpoint: "localhost:6379" + username: "test" password: "test" collection_interval: 10s tls: diff --git a/receiver/riakreceiver/testdata/scraper/expected.yaml b/receiver/riakreceiver/testdata/scraper/expected.yaml index dd1523406f3b..df2eff991ead 100644 --- a/receiver/riakreceiver/testdata/scraper/expected.yaml +++ b/receiver/riakreceiver/testdata/scraper/expected.yaml @@ -12,8 +12,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "3127377920" - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The number of operations performed by the node. name: riak.node.operation.count @@ -25,15 +25,15 @@ resourceMetrics: - key: request value: stringValue: get - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: request value: stringValue: put - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' - description: The mean time between request and response for operations performed by the node over the last minute. @@ -44,15 +44,15 @@ resourceMetrics: - key: request value: stringValue: get - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: request value: stringValue: put - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: riak.node.operation.time.mean unit: us - description: The number of read repairs performed by the node. @@ -61,8 +61,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{read_repair}' - description: The number of index operations performed by vnodes on the node. @@ -75,22 +75,22 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: operation value: stringValue: read - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: operation value: stringValue: write - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{operation}' - description: The number of operations performed by vnodes on the node. name: riak.vnode.operation.count @@ -102,15 +102,15 @@ resourceMetrics: - key: request value: stringValue: get - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: request value: stringValue: put - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' scope: diff --git a/receiver/riakreceiver/testdata/scraper/expected_disabled.yaml b/receiver/riakreceiver/testdata/scraper/expected_disabled.yaml index 694ce89bc470..4bf3ad6bf0a6 100644 --- a/receiver/riakreceiver/testdata/scraper/expected_disabled.yaml +++ b/receiver/riakreceiver/testdata/scraper/expected_disabled.yaml @@ -14,15 +14,15 @@ resourceMetrics: - key: request value: stringValue: get - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: request value: stringValue: put - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: riak.node.operation.time.mean unit: us - description: The number of read repairs performed by the node. @@ -31,8 +31,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{read_repair}' - description: The number of index operations performed by vnodes on the node. @@ -45,22 +45,22 @@ resourceMetrics: - key: operation value: stringValue: delete - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "10" attributes: - key: operation value: stringValue: read - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "11" attributes: - key: operation value: stringValue: write - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{operation}' - description: The number of operations performed by vnodes on the node. name: riak.vnode.operation.count @@ -72,15 +72,15 @@ resourceMetrics: - key: request value: stringValue: get - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "8" attributes: - key: request value: stringValue: put - startTimeUnixNano: "1648220661611816000" - timeUnixNano: "1648220661612587000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{operation}' scope: diff --git a/receiver/saphanareceiver/testdata/expected_metrics/full.yaml b/receiver/saphanareceiver/testdata/expected_metrics/full.yaml index 630058939f18..9e0657860fd8 100644 --- a/receiver/saphanareceiver/testdata/expected_metrics/full.yaml +++ b/receiver/saphanareceiver/testdata/expected_metrics/full.yaml @@ -16,29 +16,29 @@ resourceMetrics: - key: rating value: stringValue: "1" - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: rating value: stringValue: "2" - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "1000" attributes: - key: rating value: stringValue: "4" - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{alerts}' - description: The age of the latest backup by start time. gauge: dataPoints: - asInt: "13" - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: saphana.backup.latest unit: s - description: The amount of time remaining before license expiration. @@ -52,8 +52,8 @@ resourceMetrics: - key: system value: stringValue: PPE - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: saphana.license.expiration.time unit: s - description: The allowed product usage as specified by the license (for example, main memory). @@ -69,8 +69,8 @@ resourceMetrics: - key: system value: stringValue: PPE - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "128" attributes: - key: product @@ -79,8 +79,8 @@ resourceMetrics: - key: system value: stringValue: PPT - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{licenses}' - description: The peak product usage value during last 13 months, measured periodically. name: saphana.license.peak @@ -95,8 +95,8 @@ resourceMetrics: - key: system value: stringValue: PPE - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "33" attributes: - key: product @@ -105,8 +105,8 @@ resourceMetrics: - key: system value: stringValue: PPT - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{licenses}' - description: The average amount of time consumed replicating a log. gauge: @@ -125,8 +125,8 @@ resourceMetrics: - key: secondary value: stringValue: host2 - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: saphana.replication.average_time unit: us - description: The current replication backlog size. @@ -148,8 +148,8 @@ resourceMetrics: - key: secondary value: stringValue: host2 - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The current replication backlog. name: saphana.replication.backlog.time @@ -170,8 +170,8 @@ resourceMetrics: - key: secondary value: stringValue: host2 - startTimeUnixNano: "1655998954207635000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: us scope: name: otelcol/saphanareceiver @@ -199,8 +199,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "12" attributes: - key: subtype @@ -209,8 +209,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "17" attributes: - key: subtype @@ -219,8 +219,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "13" attributes: - key: subtype @@ -229,8 +229,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "18" attributes: - key: subtype @@ -239,8 +239,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "14" attributes: - key: subtype @@ -249,8 +249,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "19" attributes: - key: subtype @@ -259,8 +259,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "15" attributes: - key: subtype @@ -269,8 +269,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory used in components. name: saphana.component.memory.used @@ -282,8 +282,8 @@ resourceMetrics: - key: component value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of current connections. name: saphana.connection.count @@ -295,15 +295,15 @@ resourceMetrics: - key: status value: stringValue: idle - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "15" attributes: - key: status value: stringValue: running - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{connections}' - description: Total CPU time spent. name: saphana.cpu.used @@ -315,29 +315,29 @@ resourceMetrics: - key: type value: stringValue: idle - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8674" attributes: - key: type value: stringValue: io_wait - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "82828" attributes: - key: type value: stringValue: system - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "82" attributes: - key: type value: stringValue: user - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: ms - description: The disk size. @@ -356,8 +356,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "123" attributes: - key: path @@ -369,8 +369,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "33" attributes: - key: path @@ -382,8 +382,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "456" attributes: - key: path @@ -395,8 +395,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of physical memory on the host. name: saphana.host.memory.current @@ -408,15 +408,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "3233" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of swap space on the host. name: saphana.host.swap.current @@ -428,15 +428,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "23423" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The instance code size, including shared libraries of SAP HANA processes. name: saphana.instance.code_size @@ -444,8 +444,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5454" - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the memory pool for all SAP HANA processes. name: saphana.instance.memory.current @@ -457,15 +457,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "62727" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The shared memory size of SAP HANA processes. name: saphana.instance.memory.shared.allocated @@ -473,8 +473,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "82568" - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The peak memory from the memory pool used by SAP HANA processes since the instance started (this is a sample-based value). name: saphana.instance.memory.used.peak @@ -482,15 +482,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "342" - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The average response time calculated over recent requests gauge: dataPoints: - asDouble: 99.999 - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: saphana.network.request.average_time unit: ms - description: The number of active and pending service requests. @@ -503,15 +503,15 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: state value: stringValue: pending - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{requests}' - description: The number of service requests that have completed. name: saphana.network.request.finished.count @@ -523,15 +523,15 @@ resourceMetrics: - key: type value: stringValue: external - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "133" attributes: - key: type value: stringValue: internal - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' - description: The used memory for all row tables. @@ -544,15 +544,15 @@ resourceMetrics: - key: type value: stringValue: fixed - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "123" attributes: - key: type value: stringValue: variable - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory size for all tables in schema. name: saphana.schema.memory.used.current @@ -567,8 +567,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "7777" attributes: - key: schema @@ -577,8 +577,8 @@ resourceMetrics: - key: type value: stringValue: history_delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "43434" attributes: - key: schema @@ -587,8 +587,8 @@ resourceMetrics: - key: type value: stringValue: history_main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "123123" attributes: - key: schema @@ -597,8 +597,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The estimated maximum memory consumption for all fully loaded tables in schema (data for open transactions is not included). name: saphana.schema.memory.used.max @@ -610,8 +610,8 @@ resourceMetrics: - key: schema value: stringValue: SYS - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of operations done on all tables in schema. name: saphana.schema.operation.count @@ -626,8 +626,8 @@ resourceMetrics: - key: type value: stringValue: merge - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "123" attributes: - key: schema @@ -636,8 +636,8 @@ resourceMetrics: - key: type value: stringValue: read - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "5454" attributes: - key: schema @@ -646,8 +646,8 @@ resourceMetrics: - key: type value: stringValue: write - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{operations}' - description: The number of entries in main during the last optimize compression run for all tables in schema. @@ -660,8 +660,8 @@ resourceMetrics: - key: schema value: stringValue: SYS - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{records}' - description: The number of records for all tables in schema. name: saphana.schema.record.count @@ -676,8 +676,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "878743" attributes: - key: schema @@ -686,8 +686,8 @@ resourceMetrics: - key: type value: stringValue: history_delta - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "34843" attributes: - key: schema @@ -696,8 +696,8 @@ resourceMetrics: - key: type value: stringValue: history_main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "1234" attributes: - key: schema @@ -706,8 +706,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{records}' - description: The service code size, including shared libraries. name: saphana.service.code_size @@ -719,8 +719,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of services in a given status. name: saphana.service.count @@ -732,15 +732,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{services}' - description: The part of the memory pool that can potentially (if unpinned) be freed during a memory shortage. name: saphana.service.memory.compactors.allocated @@ -752,8 +752,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory that can be freed during a memory shortage. name: saphana.service.memory.compactors.freeable @@ -765,8 +765,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The effective maximum memory pool size, calculated considering the pool sizes of other processes. name: saphana.service.memory.effective_limit @@ -778,8 +778,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the heap portion of the memory pool. name: saphana.service.memory.heap.current @@ -794,8 +794,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "6" attributes: - key: service @@ -804,8 +804,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The configured maximum memory pool size. name: saphana.service.memory.limit @@ -817,8 +817,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the shared portion of the memory pool. name: saphana.service.memory.shared.current @@ -833,8 +833,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8" attributes: - key: service @@ -843,8 +843,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The used memory from the operating system perspective. name: saphana.service.memory.used @@ -859,8 +859,8 @@ resourceMetrics: - key: type value: stringValue: logical - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: service @@ -869,8 +869,8 @@ resourceMetrics: - key: type value: stringValue: physical - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The service stack size. name: saphana.service.stack_size @@ -882,8 +882,8 @@ resourceMetrics: - key: service value: stringValue: nameserver - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of service threads in a given status. name: saphana.service.thread.count @@ -895,15 +895,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "11" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{threads}' - description: The number of transactions waiting for a lock. name: saphana.transaction.blocked @@ -911,8 +911,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{transactions}' - description: The number of transactions. name: saphana.transaction.count @@ -924,22 +924,22 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: type value: stringValue: rollback - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "100" attributes: - key: type value: stringValue: update - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{transactions}' - description: The uptime of the database. @@ -955,8 +955,8 @@ resourceMetrics: - key: system value: stringValue: PPE - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: s - description: The number of operations executed. name: saphana.volume.operation.count @@ -974,8 +974,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: path @@ -987,8 +987,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{operations}' - description: The size of operations executed. @@ -1007,8 +1007,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "3" attributes: - key: path @@ -1020,8 +1020,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: The time spent executing operations. @@ -1040,8 +1040,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "3" attributes: - key: path @@ -1053,8 +1053,8 @@ resourceMetrics: - key: usage_type value: stringValue: LOG_SOMETHING - startTimeUnixNano: "1655998954206841000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: ms scope: @@ -1083,8 +1083,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "100" attributes: - key: subtype @@ -1093,8 +1093,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "95" attributes: - key: subtype @@ -1103,8 +1103,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "99" attributes: - key: subtype @@ -1113,8 +1113,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "94" attributes: - key: subtype @@ -1123,8 +1123,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "98" attributes: - key: subtype @@ -1133,8 +1133,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "93" attributes: - key: subtype @@ -1143,8 +1143,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "97" attributes: - key: subtype @@ -1153,8 +1153,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory used in components. name: saphana.component.memory.used @@ -1166,8 +1166,8 @@ resourceMetrics: - key: component value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of current connections. name: saphana.connection.count @@ -1179,8 +1179,8 @@ resourceMetrics: - key: status value: stringValue: idle - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{connections}' - description: Total CPU time spent. name: saphana.cpu.used @@ -1192,29 +1192,29 @@ resourceMetrics: - key: type value: stringValue: idle - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "884" attributes: - key: type value: stringValue: io_wait - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "774" attributes: - key: type value: stringValue: system - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "412" attributes: - key: type value: stringValue: user - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: ms - description: The disk size. @@ -1233,8 +1233,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "234423234" attributes: - key: path @@ -1246,8 +1246,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of physical memory on the host. name: saphana.host.memory.current @@ -1259,15 +1259,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The amount of swap space on the host. name: saphana.host.swap.current @@ -1279,15 +1279,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "42424" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The instance code size, including shared libraries of SAP HANA processes. name: saphana.instance.code_size @@ -1295,8 +1295,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "44" - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the memory pool for all SAP HANA processes. name: saphana.instance.memory.current @@ -1308,15 +1308,15 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "451" attributes: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The shared memory size of SAP HANA processes. name: saphana.instance.memory.shared.allocated @@ -1324,8 +1324,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4123123" - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The peak memory from the memory pool used by SAP HANA processes since the instance started (this is a sample-based value). name: saphana.instance.memory.used.peak @@ -1333,15 +1333,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "212" - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The average response time calculated over recent requests gauge: dataPoints: - asDouble: 0.222 - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: saphana.network.request.average_time unit: ms - description: The number of active and pending service requests. @@ -1354,15 +1354,15 @@ resourceMetrics: - key: state value: stringValue: active - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "222" attributes: - key: state value: stringValue: pending - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{requests}' - description: The number of service requests that have completed. name: saphana.network.request.finished.count @@ -1374,15 +1374,15 @@ resourceMetrics: - key: type value: stringValue: external - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "3" attributes: - key: type value: stringValue: internal - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{requests}' - description: The used memory for all row tables. @@ -1395,15 +1395,15 @@ resourceMetrics: - key: type value: stringValue: fixed - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "12323233" attributes: - key: type value: stringValue: variable - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory size for all tables in schema. name: saphana.schema.memory.used.current @@ -1418,8 +1418,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8265" attributes: - key: schema @@ -1428,8 +1428,8 @@ resourceMetrics: - key: type value: stringValue: history_delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "2456" attributes: - key: schema @@ -1438,8 +1438,8 @@ resourceMetrics: - key: type value: stringValue: history_main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: schema @@ -1448,8 +1448,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The estimated maximum memory consumption for all fully loaded tables in schema (data for open transactions is not included). name: saphana.schema.memory.used.max @@ -1461,8 +1461,8 @@ resourceMetrics: - key: schema value: stringValue: MON - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of operations done on all tables in schema. name: saphana.schema.operation.count @@ -1477,8 +1477,8 @@ resourceMetrics: - key: type value: stringValue: merge - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "76578" attributes: - key: schema @@ -1487,8 +1487,8 @@ resourceMetrics: - key: type value: stringValue: read - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "7245" attributes: - key: schema @@ -1497,8 +1497,8 @@ resourceMetrics: - key: type value: stringValue: write - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{operations}' - description: The number of entries in main during the last optimize compression run for all tables in schema. @@ -1511,8 +1511,8 @@ resourceMetrics: - key: schema value: stringValue: MON - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{records}' - description: The number of records for all tables in schema. name: saphana.schema.record.count @@ -1527,8 +1527,8 @@ resourceMetrics: - key: type value: stringValue: delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "85" attributes: - key: schema @@ -1537,8 +1537,8 @@ resourceMetrics: - key: type value: stringValue: history_delta - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8888" attributes: - key: schema @@ -1547,8 +1547,8 @@ resourceMetrics: - key: type value: stringValue: history_main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "654" attributes: - key: schema @@ -1557,8 +1557,8 @@ resourceMetrics: - key: type value: stringValue: main - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{records}' - description: The service code size, including shared libraries. name: saphana.service.code_size @@ -1570,8 +1570,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of services in a given status. name: saphana.service.count @@ -1583,15 +1583,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{services}' - description: The part of the memory pool that can potentially (if unpinned) be freed during a memory shortage. name: saphana.service.memory.compactors.allocated @@ -1603,8 +1603,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The memory that can be freed during a memory shortage. name: saphana.service.memory.compactors.freeable @@ -1616,8 +1616,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The effective maximum memory pool size, calculated considering the pool sizes of other processes. name: saphana.service.memory.effective_limit @@ -1629,8 +1629,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the heap portion of the memory pool. name: saphana.service.memory.heap.current @@ -1645,8 +1645,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "9" attributes: - key: service @@ -1655,8 +1655,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The configured maximum memory pool size. name: saphana.service.memory.limit @@ -1668,8 +1668,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The size of the shared portion of the memory pool. name: saphana.service.memory.shared.current @@ -1684,8 +1684,8 @@ resourceMetrics: - key: state value: stringValue: free - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "11" attributes: - key: service @@ -1694,8 +1694,8 @@ resourceMetrics: - key: state value: stringValue: used - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The used memory from the operating system perspective. name: saphana.service.memory.used @@ -1710,8 +1710,8 @@ resourceMetrics: - key: type value: stringValue: logical - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "5" attributes: - key: service @@ -1720,8 +1720,8 @@ resourceMetrics: - key: type value: stringValue: physical - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The service stack size. name: saphana.service.stack_size @@ -1733,8 +1733,8 @@ resourceMetrics: - key: service value: stringValue: indexserver - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By - description: The number of service threads in a given status. name: saphana.service.thread.count @@ -1746,15 +1746,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "1111" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{threads}' - description: The number of transactions waiting for a lock. name: saphana.transaction.blocked @@ -1762,8 +1762,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "292393" - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{transactions}' - description: The number of transactions. name: saphana.transaction.count @@ -1775,22 +1775,22 @@ resourceMetrics: - key: type value: stringValue: commit - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "333" attributes: - key: type value: stringValue: rollback - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: type value: stringValue: update - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{transactions}' - description: The number of operations executed. @@ -1809,8 +1809,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "72" attributes: - key: path @@ -1822,8 +1822,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: '{operations}' - description: The size of operations executed. @@ -1842,8 +1842,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "37" attributes: - key: path @@ -1855,8 +1855,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: By - description: The time spent executing operations. @@ -1875,8 +1875,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "33" attributes: - key: path @@ -1888,8 +1888,8 @@ resourceMetrics: - key: usage_type value: stringValue: DATA - startTimeUnixNano: "1655998954206896000" - timeUnixNano: "1655998954206724000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" isMonotonic: true unit: ms scope: diff --git a/receiver/saphanareceiver/testdata/expected_metrics/mostly_disabled.yaml b/receiver/saphanareceiver/testdata/expected_metrics/mostly_disabled.yaml index 900dff1d7df4..7c5704500c81 100644 --- a/receiver/saphanareceiver/testdata/expected_metrics/mostly_disabled.yaml +++ b/receiver/saphanareceiver/testdata/expected_metrics/mostly_disabled.yaml @@ -19,15 +19,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651180632896781000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651180632896781000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{services}' - description: The number of service threads in a given status. name: saphana.service.thread.count @@ -39,15 +39,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651180632896781000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "11" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651180632896781000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{threads}' scope: name: otelcol/saphanareceiver @@ -72,15 +72,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651180632896952000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "8" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651180632896952000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{services}' - description: The number of service threads in a given status. name: saphana.service.thread.count @@ -92,15 +92,15 @@ resourceMetrics: - key: status value: stringValue: active - startTimeUnixNano: "1651180632896952000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "1111" attributes: - key: status value: stringValue: inactive - startTimeUnixNano: "1651180632896952000" - timeUnixNano: "1651180632896172000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{threads}' scope: name: otelcol/saphanareceiver diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 6739d1dc2a90..44475829c99d 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1457,6 +1457,7 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= diff --git a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod index 7df513ec1589..5c2392f96641 100644 --- a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod +++ b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/prometheus/client_golang v1.16.0 - go.opentelemetry.io/otel v1.16.0 - go.opentelemetry.io/otel/exporters/prometheus v0.39.0 - go.opentelemetry.io/otel/metric v1.16.0 - go.opentelemetry.io/otel/sdk/metric v0.39.0 + go.opentelemetry.io/otel v1.17.0 + go.opentelemetry.io/otel/exporters/prometheus v0.40.0 + go.opentelemetry.io/otel/metric v1.17.0 + go.opentelemetry.io/otel/sdk/metric v0.40.0 go.uber.org/zap v1.25.0 ) @@ -21,8 +21,8 @@ require ( github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.11.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum index fc7a33141f1e..726fae3b220d 100644 --- a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum +++ b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/go.sum @@ -26,19 +26,19 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= -go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/exporters/prometheus v0.40.0 h1:9h6lCssr1j5aYVvWT6oc+ERB6R034zmsHjBRLyxrAR8= +go.opentelemetry.io/otel/exporters/prometheus v0.40.0/go.mod h1:5USWZ0ovyQB5CIM3IO3bGRSoDPMXiT3t+15gu8Zo9HQ= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= +go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= +go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index aaffca0cac2f..eaa9706ab0c4 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -31,7 +31,7 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect @@ -66,8 +66,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -158,7 +158,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/api v0.136.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 7d260123ca7c..12f584955338 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -80,8 +80,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.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -282,11 +282,11 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -939,7 +939,7 @@ 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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= 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= @@ -956,8 +956,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index febe66c7d935..7519f83a86a2 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywal go 1.20 require ( - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/gorilla/mux v1.8.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.83.0 github.com/stretchr/testify v1.8.4 diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 794112dd81fa..8ff40cd8c957 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -123,8 +123,8 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= diff --git a/receiver/snmpreceiver/README.md b/receiver/snmpreceiver/README.md index e1719a7d0707..61e72a030001 100644 --- a/receiver/snmpreceiver/README.md +++ b/receiver/snmpreceiver/README.md @@ -38,6 +38,7 @@ This receiver supports SNMP versions: These configuration options are for connecting to a SNMP host. - `collection_interval`: (default = `10s`): This receiver collects metrics on an interval. This value must be a string readable by Golang's [time.ParseDuration](https://pkg.go.dev/time#ParseDuration). Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. +- `timeout`: (default: `5s`): Timeout for each SNMP request. This value must be a string readable by Golang's [time.ParseDuration](https://pkg.go.dev/time#ParseDuration). Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. - `endpoint` (default: `udp://localhost:161`): SNMP endpoint to connect to in the form of `[udp|tcp][://]{host}[:{port}]` - If no scheme is supplied, a default of `udp` is assumed - If no port is supplied, a default of `161` is assumed diff --git a/receiver/snmpreceiver/client.go b/receiver/snmpreceiver/client.go index e1c8ce7321c6..1b579999564d 100644 --- a/receiver/snmpreceiver/client.go +++ b/receiver/snmpreceiver/client.go @@ -8,7 +8,6 @@ import ( "net/url" "strconv" "strings" - "time" "github.com/gosnmp/gosnmp" "go.opentelemetry.io/collector/receiver/scrapererror" @@ -62,7 +61,7 @@ var _ client = (*snmpClient)(nil) func newClient(cfg *Config, logger *zap.Logger) (client, error) { // Create goSNMP client goSNMP := newGoSNMPWrapper() - goSNMP.SetTimeout(5 * time.Second) + goSNMP.SetTimeout(cfg.Timeout) // Set goSNMP version based on config switch cfg.Version { diff --git a/receiver/snmpreceiver/config.go b/receiver/snmpreceiver/config.go index b01ab33874af..62b130118a7b 100644 --- a/receiver/snmpreceiver/config.go +++ b/receiver/snmpreceiver/config.go @@ -17,6 +17,7 @@ import ( // Config Defaults const ( defaultCollectionInterval = 10 * time.Second // In seconds + defaultTimeout = 5 * time.Second // In seconds defaultEndpoint = "udp://localhost:161" defaultVersion = "v2c" defaultCommunity = "public" diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index 07b2198feb13..aa18638e8bf9 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -33,6 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: defaultCollectionInterval, + Timeout: defaultTimeout, }, Endpoint: defaultEndpoint, Version: defaultVersion, @@ -68,7 +69,7 @@ func createMetricsReceiver( return scraperhelper.NewScraperControllerReceiver(&snmpConfig.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper)) } -// addMissingConfigDefaults adds any missing comfig parameters that have defaults +// addMissingConfigDefaults adds any missing config parameters that have defaults func addMissingConfigDefaults(cfg *Config) error { // Add the schema prefix to the endpoint if it doesn't contain one if !strings.Contains(cfg.Endpoint, "://") { diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index 87734e9f30db..d52d03f7d4b1 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -36,6 +36,7 @@ func TestNewFactory(t *testing.T) { var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: defaultCollectionInterval, + Timeout: defaultTimeout, }, Endpoint: defaultEndpoint, Version: defaultVersion, diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index b5602405f7a6..d12c5ac4648d 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -42,7 +42,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.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -112,7 +112,7 @@ require ( golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.7.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect google.golang.org/grpc v1.57.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 5df006fc06c2..d121d1c98f75 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -223,8 +223,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gosnmp/gosnmp v1.35.0 h1:EuWWNPxTCdAUx2/NbQcSa3WdNxjzpy4Phv57b4MWpJM= @@ -798,8 +798,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/snmpreceiver/testdata/expected_metrics/10_indexed_scalar_metrics_same_resource_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/10_indexed_scalar_metrics_same_resource_golden.yaml index afe8e0dc4828..6e5581db4c7f 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/10_indexed_scalar_metrics_same_resource_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/10_indexed_scalar_metrics_same_resource_golden.yaml @@ -6,7 +6,7 @@ resourceMetrics: gauge: dataPoints: - asInt: "0" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric0 unit: By - description: test description1 @@ -17,13 +17,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/11_indexed_multiple_metrics_same_resource_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/11_indexed_multiple_metrics_same_resource_golden.yaml index 7b437ac59c82..ce2fa42f9d21 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/11_indexed_multiple_metrics_same_resource_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/11_indexed_multiple_metrics_same_resource_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "1" attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric0 unit: By - description: test description1 @@ -27,13 +27,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "3" attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/12_indexed_metrics_w_all_attrs_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/12_indexed_metrics_w_all_attrs_golden.yaml index 07cc98faa84c..70475becfaf4 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/12_indexed_metrics_w_all_attrs_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/12_indexed_metrics_w_all_attrs_golden.yaml @@ -16,7 +16,7 @@ resourceMetrics: - key: attr3 value: stringValue: thing1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 @@ -28,7 +28,7 @@ resourceMetrics: - key: attr3 value: stringValue: thing2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/13_indexed_metrics_w_column_oid_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/13_indexed_metrics_w_column_oid_attr_golden.yaml index e9586089c293..530cc1adb99a 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/13_indexed_metrics_w_column_oid_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/13_indexed_metrics_w_column_oid_attr_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: thing1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: thing2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/14_indexed_column_oid_float_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/14_indexed_column_oid_float_attr_golden.yaml index 2190acbc5861..1eab818df6cf 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/14_indexed_column_oid_float_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/14_indexed_column_oid_float_attr_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: "1.11" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: "2.22" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/15_indexed_column_oid_int_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/15_indexed_column_oid_int_attr_golden.yaml index 5562daba8aae..b900dfd3aea6 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/15_indexed_column_oid_int_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/15_indexed_column_oid_int_attr_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: "2" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/16_indexed_prefix_res_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/16_indexed_prefix_res_attr_golden.yaml index 07f989c41bd8..fac26d753d38 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/16_indexed_prefix_res_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/16_indexed_prefix_res_attr_golden.yaml @@ -10,14 +10,14 @@ resourceMetrics: gauge: dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By - description: test description2 gauge: dataPoints: - asDouble: 1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric2 unit: '{units}' scope: @@ -34,14 +34,14 @@ resourceMetrics: gauge: dataPoints: - asInt: "2" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By - description: test description2 gauge: dataPoints: - asDouble: 2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric2 unit: '{units}' scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/17_indexed_oid_res_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/17_indexed_oid_res_attr_golden.yaml index 46fe86271be3..cabd24ec5a60 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/17_indexed_oid_res_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/17_indexed_oid_res_attr_golden.yaml @@ -10,14 +10,14 @@ resourceMetrics: gauge: dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By - description: test description2 gauge: dataPoints: - asDouble: 1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric2 unit: '{units}' scope: @@ -34,14 +34,14 @@ resourceMetrics: gauge: dataPoints: - asInt: "2" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By - description: test description2 gauge: dataPoints: - asDouble: 2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric2 unit: '{units}' scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/18_indexed_oid_and_prefix_res_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/18_indexed_oid_and_prefix_res_attr_golden.yaml index 125d8f84eb2f..5a72ea49e5d0 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/18_indexed_oid_and_prefix_res_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/18_indexed_oid_and_prefix_res_attr_golden.yaml @@ -13,7 +13,7 @@ resourceMetrics: gauge: dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: @@ -33,7 +33,7 @@ resourceMetrics: gauge: dataPoints: - asInt: "2" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/1_scalar_metrics_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/1_scalar_metrics_golden.yaml index 7aaf0860a744..5ac6a13ce383 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/1_scalar_metrics_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/1_scalar_metrics_golden.yaml @@ -6,7 +6,7 @@ resourceMetrics: gauge: dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/2_scalar_metrics_sum_cumulative_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/2_scalar_metrics_sum_cumulative_golden.yaml index c5dc442cbd27..9b18ed1a6a14 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/2_scalar_metrics_sum_cumulative_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/2_scalar_metrics_sum_cumulative_golden.yaml @@ -8,7 +8,7 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asDouble: 1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/3_scalar_metrics_sum_delta_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/3_scalar_metrics_sum_delta_golden.yaml index 1e94ad529315..a6e01228f74a 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/3_scalar_metrics_sum_delta_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/3_scalar_metrics_sum_delta_golden.yaml @@ -8,7 +8,7 @@ resourceMetrics: aggregationTemporality: 1 dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: By scope: name: otelcol/snmpreceiver diff --git a/receiver/snmpreceiver/testdata/expected_metrics/4_scalar_multiple_metrics_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/4_scalar_multiple_metrics_golden.yaml index dd485856e41e..abe5439d047e 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/4_scalar_multiple_metrics_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/4_scalar_multiple_metrics_golden.yaml @@ -6,14 +6,14 @@ resourceMetrics: gauge: dataPoints: - asInt: "1" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By - description: test description2 gauge: dataPoints: - asInt: "2" - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric2 unit: '{things}' scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/5_scalar_metric_w_attr_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/5_scalar_metric_w_attr_golden.yaml index 62092ee57b15..71e3fa0e810d 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/5_scalar_metric_w_attr_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/5_scalar_metric_w_attr_golden.yaml @@ -13,7 +13,7 @@ resourceMetrics: - key: attr2NewName value: stringValue: val2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/6_scalar_metric_w_multi_datapoint_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/6_scalar_metric_w_multi_datapoint_golden.yaml index 0fd7a2d0b33a..0352c07fd9d8 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/6_scalar_metric_w_multi_datapoint_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/6_scalar_metric_w_multi_datapoint_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: val1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: val2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/7_indexed_metrics_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/7_indexed_metrics_golden.yaml index 9616264df040..8a7e942ad609 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/7_indexed_metrics_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/7_indexed_metrics_golden.yaml @@ -10,13 +10,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" name: metric1 unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/8_indexed_metrics_sum_cumulative_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/8_indexed_metrics_sum_cumulative_golden.yaml index 389e67dfdc70..cac7eeb49d1a 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/8_indexed_metrics_sum_cumulative_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/8_indexed_metrics_sum_cumulative_golden.yaml @@ -12,13 +12,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asDouble: 2 attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" isMonotonic: true unit: By scope: diff --git a/receiver/snmpreceiver/testdata/expected_metrics/9_indexed_metrics_sum_delta_golden.yaml b/receiver/snmpreceiver/testdata/expected_metrics/9_indexed_metrics_sum_delta_golden.yaml index 4437986f52bd..72a6b24769c0 100644 --- a/receiver/snmpreceiver/testdata/expected_metrics/9_indexed_metrics_sum_delta_golden.yaml +++ b/receiver/snmpreceiver/testdata/expected_metrics/9_indexed_metrics_sum_delta_golden.yaml @@ -12,13 +12,13 @@ resourceMetrics: - key: attr1 value: stringValue: attrPrefix.1 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: attr1 value: stringValue: attrPrefix.2 - timeUnixNano: "1651783494931319000" + timeUnixNano: "1000000" unit: By scope: name: otelcol/snmpreceiver diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index d7d21d61f16c..b8e1a6cc8ce3 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -29,19 +29,19 @@ require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/thrift v0.16.0 // indirect - github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // 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.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // 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.9.11 // 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.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index 626f39419b7b..d1dbcadaf2bf 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -36,8 +36,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-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= 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/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= @@ -45,20 +45,20 @@ github.com/aws/aws-sdk-go-v2/config v1.18.19 h1:AqFK6zFNtq4i1EYu+eC7lcKHYnZagMn6 github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= 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.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= 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.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= 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.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= 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.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 h1:p5luUImdIqywn6JpQsW3tq5GNOxKmOnEpybzPx+d1lk= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= @@ -71,27 +71,27 @@ 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.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= 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.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= 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/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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= 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.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= 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.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= 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.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -194,7 +194,7 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= diff --git a/receiver/snowflakereceiver/testdata/scraper/expected.yaml b/receiver/snowflakereceiver/testdata/scraper/expected.yaml index fd0bb9dcf881..f2bffd308db5 100644 --- a/receiver/snowflakereceiver/testdata/scraper/expected.yaml +++ b/receiver/snowflakereceiver/testdata/scraper/expected.yaml @@ -32,8 +32,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.database.bytes_scanned.avg unit: By - description: Total query count for database over the last 24 hour window. @@ -62,8 +62,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.database.query.count unit: "1" - description: Blocked query count for warehouse over the last 24 hour window. @@ -74,8 +74,8 @@ resourceMetrics: - key: warehouse_name value: stringValue: t - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.blocked unit: "1" - description: Average bytes deleted in database over the last 24 hour window. @@ -104,8 +104,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.bytes_deleted.avg unit: By - description: Average bytes written by database over the last 24 hour window. @@ -134,8 +134,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.bytes_written.avg unit: By - description: Average time taken to compile query over the last 24 hour window. @@ -164,8 +164,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.compilation_time.avg unit: s - description: Executed query count for warehouse over the last 24 hour window. @@ -176,8 +176,8 @@ resourceMetrics: - key: warehouse_name value: stringValue: t - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.executed unit: "1" - description: Average time spent executing queries in database over the last 24 hour window. @@ -206,8 +206,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.execution_time.avg unit: s - description: Overloaded query count for warehouse over the last 24 hour window. @@ -218,8 +218,8 @@ resourceMetrics: - key: warehouse_name value: stringValue: t - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.queued_overload unit: "1" - description: Number of compute resources queued for provisioning over the last 24 hour window. @@ -230,8 +230,8 @@ resourceMetrics: - key: warehouse_name value: stringValue: t - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.query.queued_provision unit: "1" - description: Average time spent in warehouse queue due to warehouse being overloaded over the last 24 hour window. @@ -260,8 +260,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.queued_overload_time.avg unit: s - description: Average time spent in warehouse queue waiting for resources to provision over the last 24 hour window. @@ -290,8 +290,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.queued_provisioning_time.avg unit: s - description: Average time spent in warehouse queue waiting for compute resources to be repaired over the last 24 hour window. @@ -320,24 +320,24 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.queued_repair_time.avg unit: s - description: Number of bytes of stage storage used by files in all internal stages (named, table, user). gauge: dataPoints: - asInt: "2" - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.storage.stage_bytes.total unit: By - description: Number of bytes of table storage used, including bytes for data currently in Time Travel. gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.storage.storage_bytes.total unit: By - description: Average elapsed time over the last 24 hour window. @@ -366,8 +366,8 @@ resourceMetrics: - key: warehouse_size value: stringValue: g - startTimeUnixNano: "1673535514803922000" - timeUnixNano: "1673535514803926000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: snowflake.total_elapsed_time.avg unit: s scope: diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 1b788525eccb..d332e4d613b2 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 - go.opentelemetry.io/otel v1.16.0 + go.opentelemetry.io/otel v1.17.0 go.uber.org/zap v1.25.0 google.golang.org/protobuf v1.31.0 ) @@ -37,8 +37,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index ae3ea4f9443c..ea1a0bdc34e9 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -281,12 +281,12 @@ go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L5 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 28b8ff535fb2..b6df9131016d 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.83.0 - github.com/sijms/go-ora/v2 v2.7.11 + github.com/sijms/go-ora/v2 v2.7.15 github.com/snowflakedb/gosnowflake v1.6.23 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.23.0 @@ -41,19 +41,19 @@ require ( github.com/antonmedv/expr v1.13.0 // indirect github.com/apache/arrow/go/v12 v12.0.1 // indirect github.com/apache/thrift v0.16.0 // indirect - github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // 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.1.38 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // 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.9.11 // 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.9.32 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect - github.com/aws/smithy-go v1.14.1 // indirect + github.com/aws/smithy-go v1.14.2 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/containerd v1.7.3 // indirect @@ -74,7 +74,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/flatbuffers v23.1.21+incompatible // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // 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 @@ -125,7 +125,7 @@ require ( golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.12.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 211dc69cade0..532e006c26f0 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -49,8 +49,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-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= 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/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= @@ -58,20 +58,20 @@ github.com/aws/aws-sdk-go-v2/config v1.18.19 h1:AqFK6zFNtq4i1EYu+eC7lcKHYnZagMn6 github.com/aws/aws-sdk-go-v2/config v1.18.19/go.mod h1:XvTmGMY8d52ougvakOv1RpiTLPz9dlG/OQHsKU/cMmY= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= 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.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= -github.com/aws/aws-sdk-go-v2/credentials v1.13.32/go.mod h1:lL8U3v/Y79YRG69WlAho0OHIKUXCyFvSXaIvfo81sls= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35 h1:QpsNitYJu0GgvMBLUIYu9H4yryA5kMksjeIVQfgXrt8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.35/go.mod h1:o7rCaLtvK0hUggAGclf76mNGGkaG5a9KWlp+d9IpcV8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= 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.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8/go.mod h1:ce7BgLQfYr5hQFdy67oX2svto3ufGtm6oBvmsHScI1Q= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= 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.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= 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.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 h1:p5luUImdIqywn6JpQsW3tq5GNOxKmOnEpybzPx+d1lk= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32/go.mod h1:XGhIBZDEgfqmFIugclZ6FU7v75nHhBDtzuB4xB/tEi4= @@ -84,27 +84,27 @@ 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.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= 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.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= 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/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/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= 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.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= -github.com/aws/aws-sdk-go-v2/service/sso v1.13.2/go.mod h1:ju+nNXUunfIFamXUIZQiICjnO/TPlOmWcYhZcSy7xaE= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 h1:oCvTFSDi67AX0pOX3PuPdGFewvLRU2zzFSrTsgURNo0= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.5/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= 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.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2/go.mod h1:ubDBBaDFs1GHijSOTi8ljppML15GLG0HxhILtbjNNYQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= 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.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= -github.com/aws/aws-sdk-go-v2/service/sts v1.21.2/go.mod h1:FQ/DQcOfESELfJi5ED+IPPAjI5xC6nxtSolVVB773jM= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= -github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= +github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -239,8 +239,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -432,8 +432,8 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sijms/go-ora/v2 v2.7.11 h1:RqyIXtTyIavMfQWAB/pRPbCo3m9daS4ks7sHzWSweaA= -github.com/sijms/go-ora/v2 v2.7.11/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.7.15 h1:39rGXS0lC3RzxcrlmfkrBAHzD6OKF+m3RI7VIyht6Ds= +github.com/sijms/go-ora/v2 v2.7.15/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= @@ -647,8 +647,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-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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/sshcheckreceiver/testdata/expected_metrics/cannot_authenticate.yaml b/receiver/sshcheckreceiver/testdata/expected_metrics/cannot_authenticate.yaml index fb76c07a273f..7a3e503cdf38 100644 --- a/receiver/sshcheckreceiver/testdata/expected_metrics/cannot_authenticate.yaml +++ b/receiver/sshcheckreceiver/testdata/expected_metrics/cannot_authenticate.yaml @@ -6,8 +6,8 @@ resourceMetrics: gauge: dataPoints: - asInt: "35" - startTimeUnixNano: "1674675480154585000" - timeUnixNano: "1674675480154593000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: sshcheck.duration unit: ms - description: 1 if the SSH client successfully connected, otherwise 0. @@ -16,8 +16,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1674675480154585000" - timeUnixNano: "1674675480154593000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/sshcheckreceiver diff --git a/receiver/sshcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml b/receiver/sshcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml index ba4ffc90b493..c7be8cf25b22 100644 --- a/receiver/sshcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml +++ b/receiver/sshcheckreceiver/testdata/expected_metrics/invalid_endpoint.yaml @@ -6,8 +6,8 @@ resourceMetrics: gauge: dataPoints: - asInt: "33" - startTimeUnixNano: "1674675480191775000" - timeUnixNano: "1674675480191785000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: sshcheck.duration unit: ms - description: 1 if the SSH client successfully connected, otherwise 0. @@ -16,8 +16,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1674675480191775000" - timeUnixNano: "1674675480191785000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/sshcheckreceiver diff --git a/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden.yaml b/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden.yaml index 16023d7a109d..479911e41eaa 100644 --- a/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden.yaml +++ b/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden.yaml @@ -6,8 +6,8 @@ resourceMetrics: gauge: dataPoints: - asInt: "36" - startTimeUnixNano: "1674675480026255000" - timeUnixNano: "1674675480026265000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: sshcheck.duration unit: ms - description: 1 if the SSH client successfully connected, otherwise 0. @@ -16,8 +16,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1674675480026255000" - timeUnixNano: "1674675480026265000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/sshcheckreceiver diff --git a/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden_sftp.yaml b/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden_sftp.yaml index cfaab9d25b5c..863d1146f844 100644 --- a/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden_sftp.yaml +++ b/receiver/sshcheckreceiver/testdata/expected_metrics/metrics_golden_sftp.yaml @@ -6,16 +6,16 @@ resourceMetrics: gauge: dataPoints: - asInt: "33" - startTimeUnixNano: "1674675480065982000" - timeUnixNano: "1674675480066003000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: sshcheck.duration unit: ms - description: Measures SFTP request duration. gauge: dataPoints: - asInt: "52" - startTimeUnixNano: "1674675480065982000" - timeUnixNano: "1674675480066003000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: sshcheck.sftp_duration unit: ms - description: 1 if the SFTP server replied to request, otherwise 0. @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1674675480065982000" - timeUnixNano: "1674675480066003000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" - description: 1 if the SSH client successfully connected, otherwise 0. name: sshcheck.status @@ -33,8 +33,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1674675480065982000" - timeUnixNano: "1674675480066003000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: "1" scope: name: otelcol/sshcheckreceiver diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index d9477227e6c4..a52675167c07 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -15,10 +15,10 @@ require ( go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.83.0 - go.opentelemetry.io/otel v1.16.0 + go.opentelemetry.io/otel v1.17.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.25.0 - gonum.org/v1/gonum v0.13.0 + gonum.org/v1/gonum v0.14.0 ) require ( @@ -53,10 +53,10 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect go.opentelemetry.io/collector/processor v0.83.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 63e2e3841cd6..8e607d6c12ac 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -397,18 +397,18 @@ go.opentelemetry.io/collector/processor v0.83.0/go.mod h1:sLxTTqkIhmNtekO0HebXgV go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -637,8 +637,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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/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= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 035bac6fcd56..8aa542166a7b 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -50,7 +50,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 442596b5338e..bee210d6fe92 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -429,8 +429,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index e13f66755efb..1bdeeb5490df 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -48,7 +48,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 0e5e28b37364..fadabc91bc64 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -425,8 +425,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 804951721408..cb784db7b2fc 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -98,7 +98,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { }, InputConfig: func() tcp.Config { c := tcp.NewConfig() - c.Encoding.Encoding = "fake" + c.Encoding = "fake" return *c }(), } diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 617d6fbb1c75..30b372825c7e 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -44,7 +44,7 @@ require ( golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 91686ac71550..dbcb2aa8e6b8 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -417,8 +417,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index cffaa8fdc347..81e8f908152c 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -103,7 +103,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { }, InputConfig: func() udp.Config { c := udp.NewConfig() - c.Encoding.Encoding = "fake" + c.Encoding = "fake" return *c }(), } diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 4cf0352c1d30..d29c53abc3f5 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -38,7 +38,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index 38f0bd2dc22b..4358fd13ee10 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -142,8 +142,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/vcenterreceiver/testdata/metrics/expected.yaml b/receiver/vcenterreceiver/testdata/metrics/expected.yaml index 70329e3bc6b2..f02491ac4f4c 100644 --- a/receiver/vcenterreceiver/testdata/metrics/expected.yaml +++ b/receiver/vcenterreceiver/testdata/metrics/expected.yaml @@ -12,8 +12,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "252846" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The amount of CPU available to the cluster. name: vcenter.cluster.cpu.limit @@ -21,8 +21,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "280044" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The number of hosts in the cluster. name: vcenter.cluster.host.count @@ -34,15 +34,15 @@ resourceMetrics: - key: effective value: boolValue: false - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: effective value: boolValue: true - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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 @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2140347" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The available memory of the cluster. name: vcenter.cluster.memory.limit @@ -59,8 +59,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2468289376256" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: the number of virtual machines in the cluster. name: vcenter.cluster.vm.count @@ -72,15 +72,15 @@ resourceMetrics: - key: power_state value: stringValue: "off" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: power_state value: stringValue: "on" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{virtual_machines}' scope: name: otelcol/vcenterreceiver @@ -105,22 +105,22 @@ resourceMetrics: - key: disk_state value: stringValue: available - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5917763748696" attributes: - key: disk_state value: stringValue: used - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of the datastore. gauge: dataPoints: - asDouble: 10.271877533539964 - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.datastore.disk.utilization unit: '%' scope: @@ -142,15 +142,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6107" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 6.542186227878476 - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.cpu.utilization unit: '%' - description: The latency of operations to the host system's disk. @@ -161,91 +161,91 @@ resourceMetrics: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "781" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + 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: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "899" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "905" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1000" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1002" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + 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. @@ -258,386 +258,386 @@ resourceMetrics: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "7" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "2" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "28" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "45" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "88" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "92" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "31" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "4" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "6" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "6" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "8" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "19" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "4" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "25" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "76" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "63" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "5" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "10" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "7" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "6" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: read - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "781" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction value: stringValue: write - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{KiBy/s}' - description: The amount of memory the host system is using. name: vcenter.host.memory.usage @@ -645,15 +645,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "140833" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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. @@ -666,351 +666,351 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "42686" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "44277" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "43122" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "42703" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "13316" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "14473" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "19662" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "15478" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "14458" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "116" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "114" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "113" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "112" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "120" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "55647" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "57376" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "64156" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "58814" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "57390" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "105" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "103" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "104" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "102" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "109" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "40810" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "41703" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "42960" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "42206" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "41480" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "11182" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "13009" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "16489" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "12398" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "12984" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "51992" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "54712" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "59449" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "54604" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "54464" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{packets/sec}' - description: The summation of packet errors on the host network. name: vcenter.host.network.packet.errors @@ -1022,351 +1022,351 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + 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 @@ -1378,351 +1378,351 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "928" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "1120" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1646" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1291" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1058" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "570" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "768" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1269" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "927" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "681" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "357" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "351" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "376" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "363" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "376" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "411" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "422" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "551" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "617" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "488" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3064" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2537" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4373" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "3746" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "2569" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3475" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2959" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4924" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4364" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "3058" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + 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 @@ -1730,80 +1730,80 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "769" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "773" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "927" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "980" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "864" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3634" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "3305" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "5642" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4674" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "3251" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "4404" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "4079" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "6570" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "5655" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "4117" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{KiBy/s}' scope: name: otelcol/vcenterreceiver @@ -1824,8 +1824,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4000" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shares}' - description: The usage of the CPU used by the resource pool. name: vcenter.resource_pool.cpu.usage @@ -1833,8 +1833,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13791" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The amount of shares of memory in the resource pool. name: vcenter.resource_pool.memory.shares @@ -1842,8 +1842,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "163840" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shares}' - description: The usage of the memory by the resource pool. name: vcenter.resource_pool.memory.usage @@ -1851,8 +1851,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "40543" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -1879,15 +1879,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the VM. gauge: dataPoints: - asDouble: 0.11569610489780177 - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.cpu.utilization unit: '%' - description: The latency of operations to the virtual machine's disk. @@ -1901,8 +1901,8 @@ resourceMetrics: - key: disk_type value: stringValue: virtual - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1911,16 +1911,16 @@ resourceMetrics: - key: disk_type value: stringValue: virtual - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + 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: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: vcenter.vm.disk.latency.max unit: ms - description: The amount of storage space used by the virtual machine. @@ -1933,22 +1933,22 @@ resourceMetrics: - key: disk_state value: stringValue: available - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "16311648256" attributes: - key: disk_state value: stringValue: used - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 5.9280825572001286 - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.disk.utilization unit: '%' - description: The amount of memory that is ballooned due to virtualization. @@ -1957,8 +1957,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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 @@ -1966,8 +1966,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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 @@ -1975,8 +1975,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -1984,8 +1984,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "163" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1692203610701680000" + 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 @@ -1997,85 +1997,85 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + 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 @@ -2087,85 +2087,85 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: received - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction value: stringValue: transmitted - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By/sec - description: The network utilization combined transmit and receive rates during an interval. name: vcenter.vm.network.usage @@ -2173,23 +2173,23 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" - startTimeUnixNano: "1692203610692978000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{KiBy/s}' scope: name: otelcol/vcenterreceiver diff --git a/receiver/vcenterreceiver/testdata/metrics/expected_with_object.yaml b/receiver/vcenterreceiver/testdata/metrics/expected_with_object.yaml index a355633ab034..de5f893b3bc7 100644 --- a/receiver/vcenterreceiver/testdata/metrics/expected_with_object.yaml +++ b/receiver/vcenterreceiver/testdata/metrics/expected_with_object.yaml @@ -12,8 +12,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "252846" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The amount of CPU available to the cluster. name: vcenter.cluster.cpu.limit @@ -21,8 +21,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "280044" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The number of hosts in the cluster. name: vcenter.cluster.host.count @@ -34,15 +34,15 @@ resourceMetrics: - key: effective value: boolValue: false - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "3" attributes: - key: effective value: boolValue: true - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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 @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2140347" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The available memory of the cluster. name: vcenter.cluster.memory.limit @@ -59,8 +59,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "2468289376256" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: the number of virtual machines in the cluster. name: vcenter.cluster.vm.count @@ -72,15 +72,15 @@ resourceMetrics: - key: power_state value: stringValue: "off" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: power_state value: stringValue: "on" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{virtual_machines}' scope: name: otelcol/vcenterreceiver @@ -105,22 +105,22 @@ resourceMetrics: - key: disk_state value: stringValue: available - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "5917763748696" attributes: - key: disk_state value: stringValue: used - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of the datastore. gauge: dataPoints: - asDouble: 10.271877533539964 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.datastore.disk.utilization unit: '%' scope: @@ -142,15 +142,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "6107" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 6.542186227878476 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.cpu.utilization unit: '%' - description: The latency of operations to the host system's disk. @@ -164,8 +164,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction @@ -174,8 +174,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction @@ -184,8 +184,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction @@ -194,8 +194,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction @@ -204,8 +204,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "781" attributes: - key: direction @@ -214,8 +214,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction @@ -224,8 +224,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction @@ -234,8 +234,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction @@ -244,8 +244,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction @@ -254,8 +254,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" name: vcenter.host.disk.latency.avg unit: ms - description: Highest latency value across all disks used by the host. @@ -266,36 +266,36 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "899" attributes: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "905" attributes: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1000" attributes: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1002" attributes: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + 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. @@ -311,8 +311,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "45" attributes: - key: direction @@ -321,8 +321,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "88" attributes: - key: direction @@ -331,8 +331,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "92" attributes: - key: direction @@ -341,8 +341,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "31" attributes: - key: direction @@ -351,8 +351,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "4" attributes: - key: direction @@ -361,8 +361,8 @@ resourceMetrics: - key: object value: stringValue: t10.ATA_____DELLBOSS_VD_____________________________983baa25884a001000000000 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "25" attributes: - key: direction @@ -371,8 +371,8 @@ resourceMetrics: - key: object value: stringValue: t10.ATA_____DELLBOSS_VD_____________________________983baa25884a001000000000 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "76" attributes: - key: direction @@ -381,8 +381,8 @@ resourceMetrics: - key: object value: stringValue: t10.ATA_____DELLBOSS_VD_____________________________983baa25884a001000000000 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "63" attributes: - key: direction @@ -391,8 +391,8 @@ resourceMetrics: - key: object value: stringValue: t10.ATA_____DELLBOSS_VD_____________________________983baa25884a001000000000 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -401,8 +401,8 @@ resourceMetrics: - key: object value: stringValue: t10.ATA_____DELLBOSS_VD_____________________________983baa25884a001000000000 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "6" attributes: - key: direction @@ -411,8 +411,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E10E3E4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "6" attributes: - key: direction @@ -421,8 +421,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E10E3E4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4" attributes: - key: direction @@ -431,8 +431,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E10E3E4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "8" attributes: - key: direction @@ -441,8 +441,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E10E3E4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "19" attributes: - key: direction @@ -451,8 +451,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E10E3E4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "5" attributes: - key: direction @@ -461,8 +461,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E266CE4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "10" attributes: - key: direction @@ -471,8 +471,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E266CE4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "5" attributes: - key: direction @@ -481,8 +481,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E266CE4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "7" attributes: - key: direction @@ -491,8 +491,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E266CE4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "6" attributes: - key: direction @@ -501,8 +501,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_NVMe_P4610_1.6TB_SFF_00010E266CE4D25C - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "4" attributes: - key: direction @@ -511,8 +511,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____362E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -521,8 +521,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____362E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: direction @@ -531,8 +531,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____362E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction @@ -541,8 +541,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____362E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -551,8 +551,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____362E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "7" attributes: - key: direction @@ -561,8 +561,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3C2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -571,8 +571,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3C2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -581,8 +581,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3C2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4" attributes: - key: direction @@ -591,8 +591,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3C2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "2" attributes: - key: direction @@ -601,8 +601,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3C2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -611,8 +611,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3D2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -621,8 +621,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3D2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -631,8 +631,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3D2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction @@ -641,8 +641,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3D2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1" attributes: - key: direction @@ -651,8 +651,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____3D2E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -661,8 +661,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____482E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -671,8 +671,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____482E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -681,8 +681,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____482E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1" attributes: - key: direction @@ -691,8 +691,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____482E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -701,8 +701,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____482E000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -711,8 +711,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____B32D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2" attributes: - key: direction @@ -721,8 +721,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____B32D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -731,8 +731,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____B32D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "2" attributes: - key: direction @@ -741,8 +741,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____B32D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -751,8 +751,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____B32D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -761,8 +761,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____BD2D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -771,8 +771,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____BD2D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -781,8 +781,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____BD2D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -791,8 +791,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____BD2D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -801,8 +801,8 @@ resourceMetrics: - key: object value: stringValue: t10.NVMe____Dell_Express_Flash_PM1725b_3.2TB_SFF____BD2D000121382500 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "781" attributes: - key: direction @@ -811,8 +811,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "789" attributes: - key: direction @@ -821,8 +821,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "645" attributes: - key: direction @@ -831,8 +831,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "781" attributes: - key: direction @@ -841,8 +841,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "782" attributes: - key: direction @@ -851,8 +851,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{KiBy/s}' - description: The amount of memory the host system is using. name: vcenter.host.memory.usage @@ -860,15 +860,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "140833" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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. @@ -884,8 +884,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "57376" attributes: - key: direction @@ -894,8 +894,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "64156" attributes: - key: direction @@ -904,8 +904,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "58814" attributes: - key: direction @@ -914,8 +914,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "57390" attributes: - key: direction @@ -924,8 +924,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "13316" attributes: - key: direction @@ -934,8 +934,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "14473" attributes: - key: direction @@ -944,8 +944,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "19662" attributes: - key: direction @@ -954,8 +954,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "15478" attributes: - key: direction @@ -964,8 +964,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "14458" attributes: - key: direction @@ -974,8 +974,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "116" attributes: - key: direction @@ -984,8 +984,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "114" attributes: - key: direction @@ -994,8 +994,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "113" attributes: - key: direction @@ -1004,8 +1004,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "112" attributes: - key: direction @@ -1014,8 +1014,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "120" attributes: - key: direction @@ -1024,8 +1024,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "105" attributes: - key: direction @@ -1034,8 +1034,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "103" attributes: - key: direction @@ -1044,8 +1044,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "104" attributes: - key: direction @@ -1054,8 +1054,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "102" attributes: - key: direction @@ -1064,8 +1064,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "109" attributes: - key: direction @@ -1074,8 +1074,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "42110" attributes: - key: direction @@ -1084,8 +1084,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "42686" attributes: - key: direction @@ -1094,8 +1094,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "44277" attributes: - key: direction @@ -1104,8 +1104,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "43122" attributes: - key: direction @@ -1114,8 +1114,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "42703" attributes: - key: direction @@ -1124,8 +1124,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "51992" attributes: - key: direction @@ -1134,8 +1134,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "54712" attributes: - key: direction @@ -1144,8 +1144,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "59449" attributes: - key: direction @@ -1154,8 +1154,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "54604" attributes: - key: direction @@ -1164,8 +1164,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "54464" attributes: - key: direction @@ -1174,8 +1174,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "11182" attributes: - key: direction @@ -1184,8 +1184,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "13009" attributes: - key: direction @@ -1194,8 +1194,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "16489" attributes: - key: direction @@ -1204,8 +1204,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "12398" attributes: - key: direction @@ -1214,8 +1214,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "12984" attributes: - key: direction @@ -1224,8 +1224,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1234,8 +1234,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1244,8 +1244,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1254,8 +1254,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1264,8 +1264,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1274,8 +1274,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1284,8 +1284,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1294,8 +1294,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1304,8 +1304,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1314,8 +1314,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1324,8 +1324,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "40810" attributes: - key: direction @@ -1334,8 +1334,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "41703" attributes: - key: direction @@ -1344,8 +1344,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "42960" attributes: - key: direction @@ -1354,8 +1354,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "42206" attributes: - key: direction @@ -1364,8 +1364,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "41480" attributes: - key: direction @@ -1374,8 +1374,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{packets/sec}' - description: The summation of packet errors on the host network. name: vcenter.host.network.packet.errors @@ -1390,8 +1390,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1400,8 +1400,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1410,8 +1410,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1420,8 +1420,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1430,8 +1430,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1440,8 +1440,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1450,8 +1450,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1460,8 +1460,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1470,8 +1470,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1480,8 +1480,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1490,8 +1490,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1500,8 +1500,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1510,8 +1510,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1520,8 +1520,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1530,8 +1530,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1540,8 +1540,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1550,8 +1550,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1560,8 +1560,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1570,8 +1570,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1580,8 +1580,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1590,8 +1590,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1600,8 +1600,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1610,8 +1610,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1620,8 +1620,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1630,8 +1630,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1640,8 +1640,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1650,8 +1650,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1660,8 +1660,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1670,8 +1670,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1680,8 +1680,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1690,8 +1690,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1700,8 +1700,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1710,8 +1710,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1720,8 +1720,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1730,8 +1730,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1740,8 +1740,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1750,8 +1750,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1760,8 +1760,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1770,8 +1770,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1780,8 +1780,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1790,8 +1790,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1800,8 +1800,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1810,8 +1810,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1820,8 +1820,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1830,8 +1830,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1840,8 +1840,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -1850,8 +1850,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -1860,8 +1860,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -1870,8 +1870,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -1880,8 +1880,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + 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 @@ -1896,8 +1896,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "1120" attributes: - key: direction @@ -1906,8 +1906,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1646" attributes: - key: direction @@ -1916,8 +1916,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "1291" attributes: - key: direction @@ -1926,8 +1926,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "1058" attributes: - key: direction @@ -1936,8 +1936,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "570" attributes: - key: direction @@ -1946,8 +1946,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "768" attributes: - key: direction @@ -1956,8 +1956,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "1269" attributes: - key: direction @@ -1966,8 +1966,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "927" attributes: - key: direction @@ -1976,8 +1976,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "681" attributes: - key: direction @@ -1986,8 +1986,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -1996,8 +1996,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2006,8 +2006,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -2016,8 +2016,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -2026,8 +2026,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -2036,8 +2036,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -2046,8 +2046,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2056,8 +2056,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -2066,8 +2066,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -2076,8 +2076,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -2086,8 +2086,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "357" attributes: - key: direction @@ -2096,8 +2096,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "351" attributes: - key: direction @@ -2106,8 +2106,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "376" attributes: - key: direction @@ -2116,8 +2116,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "363" attributes: - key: direction @@ -2126,8 +2126,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "376" attributes: - key: direction @@ -2136,8 +2136,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3475" attributes: - key: direction @@ -2146,8 +2146,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2959" attributes: - key: direction @@ -2156,8 +2156,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4924" attributes: - key: direction @@ -2166,8 +2166,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4364" attributes: - key: direction @@ -2176,8 +2176,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "3058" attributes: - key: direction @@ -2186,8 +2186,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3064" attributes: - key: direction @@ -2196,8 +2196,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "2537" attributes: - key: direction @@ -2206,8 +2206,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "4373" attributes: - key: direction @@ -2216,8 +2216,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "3746" attributes: - key: direction @@ -2226,8 +2226,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "2569" attributes: - key: direction @@ -2236,8 +2236,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -2246,8 +2246,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2256,8 +2256,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -2266,8 +2266,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -2276,8 +2276,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -2286,8 +2286,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: direction @@ -2296,8 +2296,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2306,8 +2306,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction @@ -2316,8 +2316,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: direction @@ -2326,8 +2326,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: direction @@ -2336,8 +2336,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "411" attributes: - key: direction @@ -2346,8 +2346,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "422" attributes: - key: direction @@ -2356,8 +2356,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "551" attributes: - key: direction @@ -2366,8 +2366,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "617" attributes: - key: direction @@ -2376,8 +2376,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "488" attributes: - key: direction @@ -2386,8 +2386,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + 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 @@ -2399,176 +2399,176 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "4079" attributes: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "6570" attributes: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "5655" attributes: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "4117" attributes: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "3634" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "3305" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "5642" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "4674" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "3251" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" - asInt: "769" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808280000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "1000000" - asInt: "773" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808300000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "2000000" - asInt: "927" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808320000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "3000000" - asInt: "980" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808340000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "4000000" - asInt: "864" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652808360000000000" + startTimeUnixNano: "6000000" + timeUnixNano: "5000000" unit: '{KiBy/s}' scope: name: otelcol/vcenterreceiver @@ -2589,8 +2589,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shares}' - description: The usage of the CPU used by the resource pool. name: vcenter.resource_pool.cpu.usage @@ -2598,8 +2598,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "13791" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{MHz}' - description: The amount of shares of memory in the resource pool. name: vcenter.resource_pool.memory.shares @@ -2607,8 +2607,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "163840" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{shares}' - description: The usage of the memory by the resource pool. name: vcenter.resource_pool.memory.usage @@ -2616,8 +2616,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "40543" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -2644,15 +2644,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "12" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the VM. gauge: dataPoints: - asDouble: 0.11569610489780177 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.cpu.utilization unit: '%' - description: The latency of operations to the virtual machine's disk. @@ -2669,8 +2669,8 @@ resourceMetrics: - key: object value: stringValue: scsi0:0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2682,8 +2682,8 @@ resourceMetrics: - key: object value: stringValue: scsi0:0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + 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. @@ -2694,8 +2694,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" name: vcenter.vm.disk.latency.max unit: ms - description: The amount of storage space used by the virtual machine. @@ -2708,22 +2708,22 @@ resourceMetrics: - key: disk_state value: stringValue: available - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "16311648256" attributes: - key: disk_state value: stringValue: used - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 5.9280825572001286 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.disk.utilization unit: '%' - description: The amount of memory that is ballooned due to virtualization. @@ -2732,8 +2732,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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 @@ -2741,8 +2741,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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 @@ -2750,8 +2750,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -2759,8 +2759,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "163" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1692203610464834000" + 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 @@ -2775,8 +2775,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2785,8 +2785,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2795,8 +2795,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2805,8 +2805,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2815,8 +2815,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2825,8 +2825,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2835,8 +2835,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2845,8 +2845,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2855,8 +2855,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2865,8 +2865,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2875,8 +2875,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2885,8 +2885,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + 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 @@ -2901,8 +2901,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2911,8 +2911,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2921,8 +2921,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2931,8 +2931,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2941,8 +2941,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2951,8 +2951,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2961,8 +2961,8 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2971,8 +2971,8 @@ resourceMetrics: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2981,8 +2981,8 @@ resourceMetrics: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -2991,8 +2991,8 @@ resourceMetrics: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -3001,8 +3001,8 @@ resourceMetrics: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: direction @@ -3011,8 +3011,8 @@ resourceMetrics: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: By/sec - description: The network utilization combined transmit and receive rates during an interval. name: vcenter.vm.network.usage @@ -3024,43 +3024,43 @@ resourceMetrics: - key: object value: stringValue: "" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: "4000" - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic0 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic1 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic2 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" - asInt: "0" attributes: - key: object value: stringValue: vmnic3 - startTimeUnixNano: "1692203610460888000" - timeUnixNano: "1652798360000000000" + startTimeUnixNano: "2000000" + timeUnixNano: "1000000" unit: '{KiBy/s}' scope: name: otelcol/vcenterreceiver diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 0c0e52861f5f..88aaf82a6e89 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -44,7 +44,7 @@ require ( go.uber.org/zap v1.25.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 91686ac71550..dbcb2aa8e6b8 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -417,8 +417,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.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index b96b80e44fd0..cde56452312e 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -4,8 +4,6 @@ package zookeeperreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver" import ( - "time" - "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -16,7 +14,4 @@ type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` confignet.TCPAddr `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` - - // Timeout within which requests should be completed. - Timeout time.Duration `mapstructure:"timeout"` } diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 082660a98819..4c8fffc8ca7f 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -32,13 +32,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type) cfg.CollectionInterval = defaultCollectionInterval + cfg.Timeout = defaultTimeout return &Config{ ScraperControllerSettings: cfg, TCPAddr: confignet.TCPAddr{ Endpoint: ":2181", }, - Timeout: defaultTimeout, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } } diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 8120035a56e9..5b6e1092c260 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -33,7 +33,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/knadh/koanf v1.5.0 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index af7eef1092dd..916f65638ff5 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -137,8 +137,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= diff --git a/receiver/zookeeperreceiver/scraper.go b/receiver/zookeeperreceiver/scraper.go index 414e9cf83f8b..6d08a49fc12f 100644 --- a/receiver/zookeeperreceiver/scraper.go +++ b/receiver/zookeeperreceiver/scraper.go @@ -77,15 +77,12 @@ func (z *zookeeperMetricsScraper) shutdown(_ context.Context) error { } func (z *zookeeperMetricsScraper) scrape(ctx context.Context) (pmetric.Metrics, error) { - var ctxWithTimeout context.Context - ctxWithTimeout, z.cancel = context.WithTimeout(ctx, z.config.Timeout) - - responseMntr, err := z.runCommand(ctxWithTimeout, "mntr") + responseMntr, err := z.runCommand(ctx, "mntr") if err != nil { return pmetric.NewMetrics(), err } - responseRuok, err := z.runCommand(ctxWithTimeout, "ruok") + responseRuok, err := z.runCommand(ctx, "ruok") if err != nil { return pmetric.NewMetrics(), err } diff --git a/receiver/zookeeperreceiver/scraper_test.go b/receiver/zookeeperreceiver/scraper_test.go index 794c418fe542..03f77a58e838 100644 --- a/receiver/zookeeperreceiver/scraper_test.go +++ b/receiver/zookeeperreceiver/scraper_test.go @@ -288,8 +288,6 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { require.NoError(t, err) require.Equal(t, "zookeeper", z.Name()) - ctx := context.Background() - if tt.setConnectionDeadline != nil { z.setConnectionDeadline = tt.setConnectionDeadline } @@ -301,7 +299,8 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { if tt.sendCmd != nil { z.sendCmd = tt.sendCmd } - + ctx, cancel := context.WithTimeout(context.Background(), z.config.Timeout) + defer cancel() actualMetrics, err := z.scrape(ctx) require.NoError(t, z.shutdown(ctx)) diff --git a/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.4.14.yaml b/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.4.14.yaml index 03d616cfc8b2..e6284359bffb 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.4.14.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.4.14.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,25 +114,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -140,8 +140,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.5.5.yaml b/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.5.5.yaml index c75ff35f8ef2..08ca4ce70ad7 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.5.5.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/correctness-v3.5.5.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "107" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "54" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: The number of followers. Only exposed by the leader. name: zookeeper.follower.count @@ -63,38 +63,38 @@ resourceMetrics: - key: state value: stringValue: synced - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "1" attributes: - key: state value: stringValue: unsynced - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{followers}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -107,15 +107,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -124,25 +124,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: The number of pending syncs from the followers. Only exposed by the leader. name: zookeeper.sync.pending sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{syncs}' - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count @@ -150,8 +150,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -159,8 +159,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "5" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/disable-watches.yaml b/receiver/zookeeperreceiver/testdata/scraper/disable-watches.yaml index c2fa8271b4b8..9311a99e8d05 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/disable-watches.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/disable-watches.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,25 +114,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count sum: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966462139000" - timeUnixNano: "1642685966462251000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/error-closing-connection.yaml b/receiver/zookeeperreceiver/testdata/scraper/error-closing-connection.yaml index 7581414ff1b4..e6284359bffb 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/error-closing-connection.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/error-closing-connection.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,25 +114,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -140,8 +140,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966458919000" - timeUnixNano: "1642685966459091000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/error-setting-connection-deadline.yaml b/receiver/zookeeperreceiver/testdata/scraper/error-setting-connection-deadline.yaml index 233e9d7c10f5..e6284359bffb 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/error-setting-connection-deadline.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/error-setting-connection-deadline.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,25 +114,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -140,8 +140,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966456266000" - timeUnixNano: "1642685966456364000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/invalid-ruok.yaml b/receiver/zookeeperreceiver/testdata/scraper/invalid-ruok.yaml index eccff3029dda..88e47e8c3fef 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/invalid-ruok.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/invalid-ruok.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,8 +114,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count @@ -123,8 +123,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -132,8 +132,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/receiver/zookeeperreceiver/testdata/scraper/null-ruok.yaml b/receiver/zookeeperreceiver/testdata/scraper/null-ruok.yaml index a0ec60404fa0..5dc15f690c4a 100644 --- a/receiver/zookeeperreceiver/testdata/scraper/null-ruok.yaml +++ b/receiver/zookeeperreceiver/testdata/scraper/null-ruok.yaml @@ -15,8 +15,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "1" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{connections}' - description: Number of ephemeral nodes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.ephemeral_node.count @@ -24,8 +24,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{nodes}' - description: Size of data in bytes that a ZooKeeper server has in its data tree. name: zookeeper.data_tree.size @@ -33,15 +33,15 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "27" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: Maximum number of file descriptors that a ZooKeeper server can open. gauge: dataPoints: - asInt: "1048576" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.file_descriptor.limit unit: '{file_descriptors}' - description: Number of file descriptors that a ZooKeeper server has open. @@ -50,8 +50,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "26" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{file_descriptors}' - description: Number of times fsync duration has exceeded warning threshold. name: zookeeper.fsync.exceeded_threshold.count @@ -59,32 +59,32 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{events}' - description: Average time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.avg unit: ms - description: Maximum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.max unit: ms - description: Minimum time in milliseconds for requests to be processed. gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: zookeeper.latency.min unit: ms - description: The number of ZooKeeper packets received or sent by a server. @@ -97,15 +97,15 @@ resourceMetrics: - key: direction value: stringValue: received - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - key: direction value: stringValue: sent - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" isMonotonic: true unit: '{packets}' - description: Number of currently executing requests. @@ -114,25 +114,25 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{requests}' - description: Response from zookeeper ruok command - name: zookeeper.ruok gauge: dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966447704000" - timeUnixNano: "1642685966447860000" - unit: '1' + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: zookeeper.ruok + unit: "1" - description: Number of watches placed on Z-Nodes on a ZooKeeper server. name: zookeeper.watch.count sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{watches}' - description: Number of z-nodes that a ZooKeeper server has in its data tree. name: zookeeper.znode.count @@ -140,8 +140,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "4" - startTimeUnixNano: "1642685966444471000" - timeUnixNano: "1642685966444739000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: '{znodes}' scope: name: otelcol/zookeeperreceiver diff --git a/testbed/go.mod b/testbed/go.mod index 1e6c574ca6dc..18b1cf5c4c3f 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -76,7 +76,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apache/thrift v0.18.1 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.323 // indirect + github.com/aws/aws-sdk-go v1.44.329 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect @@ -117,8 +117,8 @@ require ( github.com/google/go-cmp v0.5.9 // 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.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gophercloud/gophercloud v1.3.0 // indirect @@ -218,11 +218,11 @@ require ( go.opentelemetry.io/collector/connector v0.83.0 // indirect go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect @@ -231,10 +231,10 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.2.1 // indirect @@ -247,8 +247,8 @@ require ( golang.org/x/term v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/api v0.136.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 11ae466e84ce..d3ee56483cde 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -782,8 +782,8 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.323 h1:97/dn93DWrN1VfhAWQ2tV+xuE6oO/LO9rSsEsuC4PLU= -github.com/aws/aws-sdk-go v1.44.323/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.329 h1:Rqy+wYI8h+iq+FphR59KKTsHR1Lz7YiwRqFzWa7xoYU= +github.com/aws/aws-sdk-go v1.44.329/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -1537,14 +1537,15 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= @@ -2745,8 +2746,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.3 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0/go.mod h1:HSmzQvagH8pS2/xrK7ScWsk0vAMtRTGbMFgInXCi8Tc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0/go.mod h1:1WpsUwjQrUJSNugfMlPn0rPRJ9Do7wwBgTBPK7MLiS4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0/go.mod h1:U5rUt7Rw6zuORsWNfpMRy8XMNKLrmIlv/4HgLVW/d5M= @@ -2771,8 +2772,9 @@ go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9 go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -2813,8 +2815,9 @@ go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= @@ -2825,8 +2828,9 @@ go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4 go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= @@ -2843,8 +2847,9 @@ go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/A go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= @@ -3521,8 +3526,9 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +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= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= @@ -3588,8 +3594,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.138.0 h1:K/tVp05MxNVbHShRw9m7e9VJGdagNeTdMzqPH7AUqr0= +google.golang.org/api v0.138.0/go.mod h1:4xyob8CxC+0GChNBvEUAk8VBKNvYOTWM9T3v3UfRxuY= 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= diff --git a/versions.yaml b/versions.yaml index ed400774e236..894e5ed24550 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,6 +7,7 @@ module-sets: modules: - github.com/open-telemetry/opentelemetry-collector-contrib - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema + - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen